cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,918 Commits 8 Branches 0 Tags
014729a001b51af3a665684fbe68a3c3e3489ef1
Commit Graph

9652 Commits

Author SHA1 Message Date
mwerezak
81890c968e Adds image for cult talismans 
So they aren't blank when examined.
 2014-12-08 20:45:15 -05:00
Ccomp5950
d8fb78b711 Merge pull request #7326 from Raptor1628/dev-freeze 
Hardsuit Fixes
 2014-12-08 20:43:56 -05:00
Ccomp5950
628f040f00 Merge pull request #7318 from sabiram/patch-1 
Potentially fixes white sundress
 2014-12-08 20:43:25 -05:00
Ccomp5950
4d615fc294 Merge pull request #7271 from Segrain/dev-freeze 
Dev-freeze fixes.
 2014-12-08 20:40:02 -05:00
Neerti
e1babe281a Fixes AI cards/mechs, with least bad method. 2014-12-08 20:14:55 -05:00
Raptor1628
921249a335 Hardsuit Fixes 
Should merge now, was missing the .dme. Fixes #7307. Adds helmet cameras
for ERT and nukeops. Fixes incorrect lighting overlays. Fixes a weird
sprite.
 2014-12-08 19:12:39 -05:00
sabiram
b27adda1c3 Potentially fixes white sundress 2014-12-08 14:30:03 -05:00
PsiOmega
445dba869d Merge branch 'dev-freeze' into dev 2014-12-08 17:38:13 +01:00
Akai Alonkai
268ec0d36a Implements existing assistant alternate job titles 
Adds an option to choose one of the alternate job titles for assistant
already defined at
https://github.com/Baystation12/Baystation12/blob/master/code/game/jobs/job/assistant.dm#L12
 2014-12-08 11:12:30 -05:00
GinjaNinja32
439cbd6255 Properly merge stuff 2014-12-08 15:36:49 +00: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
Atlantiscze
7754fda105 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into substation-features 2014-12-08 06:58:50 +01:00
Atlantiscze
2016d92358 RCON Console Construction 
- RCON consoles can now be built. They require quite high end circuit board from research, however.
 2014-12-08 06:58:10 +01:00
PsiOmegaDelta
19b359f4eb Merge pull request #7268 from GinjaNinja32/playerpanel_lang 
Allow forcesay with no client, add language toggles to player panel
 2014-12-08 06:45:38 +01:00
PsiOmegaDelta
e66f5ed765 Merge pull request #7272 from Raptor1628/dev-freeze 
Hardsuit Mark Two, more Hulabaloo
 2014-12-08 06:45:11 +01:00
Atlantiscze
321e4d443c Adds ability to modify RCON tags on SMES units and breaker boxes. 
- Use multitool to change (for SMES, screwdriver the SMES first to open cover)
 2014-12-08 06:10:47 +01:00
Neerti
9e9c297b2e Begins work, 
Holopads can receive and send emotes.
The AI, when using 'me', will check if a holopad is being used.  If so, the holopad will output the emote.  If not, it's outputted from the core.
The AI will hear emotes from near an active holopad.
There is a new obj verb called 'see_emote()', that works similarly to hear_talk().
custom_emote() modified to have 'seeing_obj' list.  May be resource-intensive, not sure.
pAIs can now hear emotes, without issue.
Carded AIs can hear emotes, but they hear themselves twice.
Mechs do not hear emotes correctly at this time.
 2014-12-07 23:03:42 -05:00
Zuhayr
371bdb10d9 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-08 13:03:20 +10:30
Zuhayr
3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Atlantiscze
994ad591e6 RCON System (v1.0) 
- Allows remote control of SMES units and Breaker Boxes.
- Adds wires to SMES units. Wires may be cut/pulsed for various effects. Signallers are supported.
- RCON console(s) may be used to monitor the SMES units (which have RCON enabled) remotely, showing output loads and charge percentages.
- SMESs may be quickly discharged by cutting the grounding wire. This however comes with little risk of overload which may damage APCs on output powernet.
 2014-12-08 03:30:20 +01:00
Raptor1628
75659ab66a Hardsuit Mark Two, more Hulabaloo 
Adds all sprites for the nukeop and research hardsuit. Shuffles around
hardsuit spawns and gear so they make sense, especially for the ERT,
they still only have two hardsuits per department, but there are enough
magboots and vests for the people who need the regular armor. Added the
medical hardsuit and its attendant gear to the station hardsuit list.
Added all of the xenoarch gear to the hazmat hardsuit for Zuh. Moves
some suit storage things around as they were lost somewhere along the
way since I committed them. Moves the Hazard Suit custom item over to
hardsuit code to prep for them being buildable on station at some point.
For now has the same stats as a voidsuit, no modules, just drains power
and has some extra pretty sprites. Sending this over to dev freeze
because most of it is required for hardsuits to be nice and pretty for
master. Now compatible with latest fixes.
 2014-12-07 21:25:08 -05:00
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
Ccomp5950
b4becaa587 Merge pull request #7264 from Zuhayr/master 
Fixes, death refactor.
 2014-12-07 19:38:21 -05:00
GinjaNinja32
48a8acad52 Removes some world<< statements 2014-12-07 23:06:49 +00:00
PsiOmegaDelta
79cd5f6430 Merge pull request #7251 from Loganbacca/implantfix 
Implant fixes/cleanup
 2014-12-07 22:05:14 +01:00
Zuhayr
ac03846778 Merge pull request #7239 from GinjaNinja32/ahelp 
Allow typing all arguments to adminhelp
 2014-12-08 05:16:47 +10:30
GinjaNinja32
e473e3d2ba Fix compile error due to depending on #7267 2014-12-07 17:23:30 +00:00
Zuhayr
a7d526f8b1 Fixes #7119 2014-12-08 03:51:21 +10:30
GinjaNinja32
9e2cf5266c Allow forcesay with no client, add language toggles to player panel 2014-12-07 17:08:36 +00:00
GinjaNinja32
b6de85ec56 Fixes, better handling of things 2014-12-07 17:01:19 +00:00
Zuhayr
1176510fb2 Amendments to previous commit. 2014-12-08 03:29:03 +10:30
GinjaNinja32
17597af7fc Better handling of language list, mobs no longer require noise-language in their list 2014-12-07 12:09:29 +00:00
GinjaNinja32
6a975a1e6a Noise emotes 
Conflicts:
	code/modules/mob/living/carbon/brain/say.dm
 2014-12-07 12:09:02 +00:00
Zuhayr
b30be0a352 Fixes #7199 2014-12-07 22:13:31 +10:30
Zuhayr
be562e675c Actually fixes scanners. 2014-12-07 21:29:30 +10:30
Zuhayr
0fe2159f86 Fixes #7092 2014-12-07 21:21:00 +10:30
Zuhayr
35f5bb16c9 Fixes #7188 2014-12-07 21:20:47 +10:30
Zuhayr
e4a332c5b6 Fixes #7262 2014-12-07 21:20:24 +10:30
Zuhayr
a7ce13f49d Fixes #7223 and #6966, adds inhand and suit sprites for nymphs. 2014-12-07 20:44:11 +10:30
Zuhayr
117dd18284 Adjusted ninja spawn proc to check rig internals. 2014-12-07 20:13:59 +10:30
Zuhayr
958eb62ed5 Refactors a lot of reused/redundant death code, fixes #7224 2014-12-07 17:18:56 +10:30
Atlantiscze
3815ac146f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pewPEWPEWboom 
Attempt to resolve merge conflict.
 2014-12-07 04:33:46 +01:00
Zuhayr
2b525372f1 Fixes #7238 2014-12-07 11:52:29 +10:30
mwerezak
550e5f63ea Makes forced launch handled by shuttle/process() 
Forced launches are now run by the shuttle controller through process()
instead of in a separate 'thread' launched from the ui.
 2014-12-06 18:07:21 -05:00
PsiOmegaDelta
5aa90044d4 Merge pull request #7249 from mwerezak/atmos-tower 
Atmos tower, Nuke prison, talismans, engine
 2014-12-06 10:25:24 +01:00
mwerezak
f752ce2a49 Adds image for cult talismans 
So they aren't blank when examined.
 2014-12-05 20:56:07 -05:00
Zuhayr
ba1f4a8f03 Merge pull request #7248 from Baystation12/master 
Master into dev.
 2014-12-06 12:18:13 +10:30
Chinsky
60fcda13e7 Merge pull request #7241 from GinjaNinja32/slimefix 
Fixes invisible slimes.
 2014-12-06 04:23:43 +03:00
Chinsky
91cbd95838 Merge pull request #7237 from PsiOmegaDelta/PunchTheKeysForGodsSake 
Fixes #7233.
 2014-12-06 04:23:31 +03:00