cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 8 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

1143 Commits

Author SHA1 Message Date
PsiOmegaDelta
63a5d009c7 Merge pull request #7267 from GinjaNinja32/noise 
Audible emote improvement, adds ability to emote over radio.
 2014-12-09 11:54:57 +01:00
Ccomp5950
4d615fc294 Merge pull request #7271 from Segrain/dev-freeze 
Dev-freeze fixes.
 2014-12-08 20:40:02 -05:00
GinjaNinja32
681a6d21ea Merge remote-tracking branch 'upstream/dev' into ! 
Conflicts:
	code/modules/mob/hear_say.dm
 2014-12-08 15:32:49 +00:00
Zuhayr
3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Segrain
e0ab31756d Fix for double definition. 2014-12-08 04:01:00 +03:00
Segrain
aa575b446a Fix for #7260. 2014-12-08 03:57:02 +03:00
GinjaNinja32
6a975a1e6a Noise emotes 
Conflicts:
	code/modules/mob/living/carbon/brain/say.dm
 2014-12-07 12:09:02 +00:00
Zuhayr
958eb62ed5 Refactors a lot of reused/redundant death code, fixes #7224 2014-12-07 17:18:56 +10:30
PsiOmega
1f9cb08102 Syndicate borg code refactoring. 
Refactors the borg syndicate code to be more accessible to adminbus.
Syndicate borgs have a jetpack module.
Overrides canUseTopic() to limit what the Syndi-borg can interact.
Still has all access, may be more limited in the future if Bump() is refactored /tg/ style. Admins: Spawn with care.
 2014-12-04 12:56:29 +01:00
Ccomp5950
f1c77dcb16 Merge pull request #7190 from PsiOmegaDelta/Topic 
Fixes exploit that lets AIs use machinery even after cameras are disabled.
 2014-12-02 20:29:47 -05:00
PsiOmegaDelta
b05c966b64 Merge pull request #7198 from atlantiscze/interactions 
(mostly) silicon adjustments/features
 2014-12-02 07:20:58 +01:00
PsiOmegaDelta
e18d5f51f9 Merge pull request #7172 from Neerti/11_29_14_minor_borg_drone_changes 
Minor changes to drone borg sprite.
 2014-12-01 06:46:46 +01:00
PsiOmegaDelta
e5c5209f7a Merge pull request #7183 from Zuhayr/dev 
Hardsuit fixes.
 2014-12-01 05:58:24 +01:00
Atlantiscze
64f9a502f9 Mining robot module upgrade 
- Mining cyborgs can now properly work with drills.
- Mining cyborgs have received ore scanner, crowbar, and limited version of magnetic gripper.
- Mining cyborgs can now swap power cells inside mining drills, as well as upgrade them if provided better parts.
- As a bonus, cyborgs can now see how much ore is in ore boxes (because it makes sense that cyborg which mined ton of ore can check how much ore it mined)
 2014-12-01 05:11:35 +01:00
Atlantiscze
166288293b Cyborg Atmospherics Tools! 
- Matter Decompiler now clears unused pipe assemblies. Long gone are the times where cyborgs couldn't remove old pipe parts.
- Engineering and Construction cyborgs now have pipe painter tool, which allows them to paint pipes properly.
 2014-12-01 03:39:36 +01:00
Atlantiscze
afadcdc35a Increases AI power usage 
This commit increases AI power usage to 50kW. This was discussed on codershuttle and should (/w some minor lags) give the AI approximatey 60 minutes of power with fully charged SMES.
 2014-12-01 02:06:03 +01:00
Atlantiscze
e2196fe6ec Robotic Cable Coils 
- Cyborgs and Drones can now use change-colour verb to change colour of their integrated cable coil.
 2014-12-01 02:02:11 +01:00
PsiOmega
8857365c1c Fixes exploit that lets AIs use machinery even after cameras are disabled. 2014-11-30 15:24:39 +01:00
Zuhayr
14cf4aa8e3 Refactored mag grippers a bit. Kinda hate myself for writing them the way I did, but hindsight etc 2014-12-01 00:37:13 +10:30
Chinsky
dbf69cba81 Merge pull request #7154 from PsiOmegaDelta/SneakyPersonalAIs 
pAIs can now hide.
 2014-11-30 12:50:44 +03:00
PsiOmega
5e34d12877 Merge remote-tracking branch 'upstream/dev' into RoboCircuit 
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
	maps/exodus-1.dmm
 2014-11-30 10:47:36 +01:00
Chinsky
99cf1ee8f5 Merge pull request #7166 from PsiOmegaDelta/TurfClick 
Fixes AIs seeing runes in the Alt+Click panel
 2014-11-30 00:56:25 +03:00
Neerti
9cf2b467b9 Fixes the 'drone' sprite for borgs. The eyes are now actual eye sprites instead of attached to the base sprite. No more pumping 40 shots into a secborg and wondering why it won't die. 
Adds option for medical module to use the medical drone sprite.
Adds sprite for surgery and mining.  Mining will no longer use a medical sprite (why???)
 2014-11-29 14:49:08 -05:00
PsiOmegaDelta
1780b9904f Merge pull request #7164 from Amunak/chat-shenanigans 
Mostly chat-related improvements, mainly adding chattags (icons) to important channels
 2014-11-29 16:07:35 +01:00
Amunak
95032936ce Separated pAI and posibrain candidacy, fixed their jobbans. 
You can now toggle special role candidacy for pAIs and Positronic Brains separately. A pAI jobban will now display correctly.  People will be banned from posibrain if they have a jobban on both AI and Cyborg (this is reflected in the character creation GUI as well). Using 'never for this round' on the pAI popup is no longer irreversible.
 2014-11-29 00:31:27 +01:00
PsiOmega
fe493c4282 Fixes AIs seeing runes in the Alt+Click panel 
See https://github.com/tgstation/-tg-station/pull/6126.
 2014-11-28 19:36:27 +01:00
Amunak
93859e9652 Dead chat will get announcements when someone joins or leaves it. 
This is mainly for wizard and cult rounds, where it is important to know that a wizard/cultist is watching. The announcement was added for most other types of leaving/joining the ghost realm. Admin ghost doesn't get announced for obvious reasons.
 2014-11-28 13:05:26 +01:00
Neerti
a84b87a1a0 Fixes potential problem of losing your module items if you get flashed. Because copypasta. 2014-11-27 21:58:36 -05:00
PsiOmega
1364de3e22 pAIs can now hide. 
See http://baystation12.net/forums/viewtopic.php?f=67&t=11684.
 2014-11-27 09:29:17 +01:00
PsiOmega
c14411d979 Robots can now be rebuilt after destruction. 
Robotic borgs now have a circuit which can be re-installed in a new chassi after the destruction of the original.
 2014-11-27 08:58:29 +01:00
PsiOmegaDelta
8e50a32ba8 Merge pull request #7103 from Segrain/dev 
Robotic appearances.
 2014-11-23 12:05:51 +01:00
PsiOmega
1784e62621 Merge remote-tracking branch 'upstream/dev' into Stripping 
Conflicts:
	code/modules/mob/living/carbon/human/whisper.dm
 2014-11-22 11:27:19 +01:00
PsiOmegaDelta
d9aae79a32 Merge pull request #7008 from Zuhayr/spaceninjas 
Hardsuit/voidsuit change, ninja refactor.
 2014-11-22 09:30:54 +01:00
Ccomp5950
d0383883c2 Merge pull request #7094 from Neerti/borg_hud_port_2 
Semi-ports /tg/'s cyborg HUD, now with less merge conflict!
 2014-11-22 03:27:10 -05:00
PsiOmega
7182ff9c3f /tg/ input stripping. 
Borrows /tg/ html stripping code.
Ghosts are the first to be given this boon, they now have to deliberately emote things like "Spooky man and it#36&;s friends type crap".
 2014-11-21 18:32:51 +01:00
Segrain
078d6f74a5 Robotic flavour texts. 2014-11-21 19:32:40 +03:00
Segrain
7f199874fb Examining robomodules. 2014-11-21 19:28:46 +03:00
Neerti
0379acad97 Fixes a runtime I made by improper conflict resolution. 2014-11-21 03:47:38 -05:00
Neerti
72c9b2eb15 Resolves conflicts, cherrypicks my code. 2014-11-21 03:32:00 -05:00
Zuhayr
b6ee53a4c3 Added integrated AI hardsuit interface verb, tweaked Topic() a bit so the AI can use it. 2014-11-20 00:22:07 +10:30
Zuhayr
2b4cd94650 Merge resolution. 2014-11-19 23:28:09 +10:30
Zuhayr
f14c1e4402 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-11-19 23:17:48 +10:30
Zuhayr
cec617a414 Merge resolution, compile fixes with outdated glass paths/map. 2014-11-19 23:17:25 +10:30
PsiOmega
f7bc35f333 Binary Tracking 
The AI can again finally track entities using the binary channel.
 2014-11-18 12:24:54 +01:00
PsiOmega
6918b0bca6 Multiple Law Statements 
Synths can now report laws on multiple channels at the same time.
 2014-11-18 10:19:21 +01:00
PsiOmegaDelta
9b98d08d60 Merge pull request #7003 from mwerezak/window-fix 
Fixes #6702 and cleanup
 2014-11-18 08:15:47 +01:00
Zuhayr
cfb5710166 Added module damage to breach checks. Attempted to add relaymove/hardsuit interface procs but failed. 2014-11-17 00:12:57 +10:30
Zuhayr
17670a5698 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spaceninjas 2014-11-16 18:18:46 +10:30
Zuhayr
b9a52a6c35 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-11-16 18:17:31 +10:30
Zuhayr
4d64a11acd Manual merge of head.dmi. 2014-11-14 23:02:16 +10:30