cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,431 Commits 5 Branches 0 Tags
d6a070e6fc7cab1eb2052fd451b01a69f77dc624
Commit Graph

13711 Commits

Author SHA1 Message Date
PsiOmega
a3f13fd3bb Creates proper area instance of Cyborg Station, AI zone. 2014-06-30 13:16:56 +02:00
PsiOmega
d6ee97a640 Xenoflora and Xenoflora storage are now proper area instances. 2014-06-30 13:08:33 +02:00
Zuhayr
09efaff38f Merge pull request #5407 from PsiOmegaDelta/Impurity 
Creates an instance of the Hydrophonics garden area.
 2014-06-30 20:10:52 +09:30
PsiOmega
3d60faac79 Creates an instance of the Hydrophonics garden area. 
Creates proper instance of the Hydrophonics garden area to avoid issues, mainly with power/APCs.
Adjusts areas to ensure that alarms in the Hydrophonics garden do not lower emergency shutters outside in the primary hallway.
 2014-06-30 09:12:43 +02:00
Zuhayr
30385c2237 Fixes an access issue with the ID computer. 2014-06-30 08:48:51 +09:30
Chinsky
2d6e48c2e7 Merge pull request #5389 from mwerezak/sign-lang 
Improves non-verbal furry languages, fixes vox shriek playing for deaf people and in space
 2014-06-29 23:05:16 +04:00
Zuhayr
86553920bf Merge pull request #5397 from Zuhayr/dev 
Dev fixes.
 2014-06-30 00:04:25 +09:30
Chinsky
b84f55863d Merge pull request #5385 from Zuhayr/derelict 
Listening post and Xenoflora remap.
 2014-06-29 14:21:39 +04:00
Zuhayr
69d99cbced Merge pull request #5378 from PsiOmegaDelta/AlarmsAndVents 
Adds support to better handle air alarms in sensitive areas and vents with custom settings
 2014-06-29 18:33:16 +09:30
Zuhayr
f6760895ca Merge pull request #5386 from Jarcolr/dev 
Fixes #5223
 2014-06-29 18:27:59 +09:30
mwerezak
abc54987b4 Fixes escape shuttle requiring authorization after countdown has finished 2014-06-28 23:34:31 -04:00
mwerezak
b8fb66380b Fixes escape shuttle not being callable from the communications console 2014-06-28 23:26:58 -04:00
Zuhayr
922e425a33 Fixed moving between tables freely. 2014-06-29 10:46:31 +09:30
Zuhayr
bd02a78f9c Fixed dev bug with destructive analyzer and null matter lists. 2014-06-29 10:25:03 +09:30
Zuhayr
48f02db5a0 Fixed some icon issues with vox/adjusted paths, fixed icon issue with armalis cannon. 2014-06-29 10:00:35 +09:30
Zuhayr
3af608b629 Fixed a couple of oversights with cards. 2014-06-29 09:43:34 +09:30
Zuhayr
c7e9e1aa2a Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing. 2014-06-29 09:40:37 +09:30
mwerezak
112bfbc6c3 Removes taj whisker emote 2014-06-28 19:52:00 -04:00
Zuhayr
cf1abf65d9 Added better checks to leap(), prevented leap spamming (hopefully). 2014-06-29 09:20:04 +09:30
mwerezak
4713c31546 Fixes shuttles getting stuck when cancelling launch 2014-06-28 19:40:39 -04:00
mwerezak
1cc840dccc Adds the ability to force launch escape pods 
Also reduces their countdown from 15 to 10 seconds.
 2014-06-28 19:40:18 -04:00
mwerezak
c8bddfb219 Fixes shuttle announcing arrival in 7 minutes. 2014-06-28 18:47:42 -04:00
mwerezak
909e8a4e95 Fixes #4688 
Or attempts to at least.
 2014-06-28 17:42:27 -04:00
mwerezak
7189dc9d0d Tweaks nonverbal emote frequency 2014-06-28 12:20:20 -04:00
mwerezak
03648c220e Adds workaround for PHP whitelist 
Apparently there's some PHP script that needs to be updated or
something. Revert this once that is done.
 2014-06-28 12:19:57 -04:00
mwerezak
ac0bf7b853 Improves the implementation of non-verbal languages 
Cleans out the nonverbal language check from say_understands(), which
now is responsible for language only.
Nonverbal languages have a chance of causing an emote when used.
Adds sign languages, which have no verbal component.
 2014-06-28 12:19:34 -04:00
mwerezak
b25f5d8aa6 In space, no one can hear you shriek 
Or chimper for that matter. Also fixes deaf people hearing vox shriek.
 2014-06-28 10:35:20 -04:00
Jarcolr
2ed5cb2b1f Fixes #5223 
This fixes #5223 and the collectable chef hat. who used "chef" instead
of "chefhat".
 2014-06-28 17:19:55 +03:00
Zuhayr
2aa5460308 Merge branch 'derelict' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-28 22:36:56 +09:30
Chinsky
42a3a27329 Merge pull request #5384 from Jarcolr/custom_item 
Updates a custom item sprite and adds 2 approved custom items
 2014-06-28 17:00:56 +04:00
Zuhayr
cfd822f69d Reduced botanist spawn count, renamed to Gardener, increased Science and Chef spawn count, added Xenobotanist alt title to Scientist. 2014-06-28 22:24:26 +09:30
Jarcolr
be74be4c95 Fixes the jackboots 2014-06-28 14:11:58 +03:00
Zuhayr
44d6bc199a Merge pull request #5379 from PsiOmegaDelta/AIStun 
AI now handles the sunned status like other creatures do in their life.dm file
 2014-06-28 19:43:27 +09:30
Jarcolr
5de1f11e8d Updates a item sprite and adds 2 approved items 
http://baystation12.net/forums/viewtopic.php?f=33&t=10693
http://baystation12.net/forums/viewtopic.php?f=33&t=10678
Paths to new files are:
/obj/item/weapon/lighter/zippo/fluff/isaac_jachym
/obj/item/clothing/shoes/jackboots/fluff/kecer_eldraran
 2014-06-28 11:33:49 +03:00
Zuhayr
a7f61c5036 Merge pull request #5376 from Jarcolr/patch-2 
Psych bed >> psychiatrists couch
 2014-06-28 08:41:02 +09:30
Jarcolr
14818b312a Psychiatrists couch 2014-06-27 22:38:57 +03:00
Zuhayr
344c6bd622 Merge pull request #5377 from Ccomp5950/teacup-spawn-fix 
Teacup icon clipping fix.
 2014-06-28 05:08:16 +09:30
PsiOmega
972bbac033 AI now handles EMP-stun like other creatures do in their life.dm file 
Previously AI would be stunned indefinitely after being hit with an EMP-blast. This would prevent emergency shutters from being operated.
The stun status is now adjusted down in the Life()-proc like is done in the base living.dm, which the AI living.dm does not ..() call.
 2014-06-27 21:24:01 +02:00
Chinsky
6bd0743aa3 Merge pull request #5367 from Zuhayr/voxwhitelist 
Adds Vox as a station race, adds vox clothing icons from /vg/.
 2014-06-27 19:36:31 +04:00
Chinsky
34137c5550 Merge pull request #5362 from Loganbacca/atmoso 
Atmos Overhaul - Phase 1
 2014-06-27 19:31:50 +04:00
Mloc
bd7161df33 Merge pull request #5370 from Zuhayr/master 
Nerfs biohazard random event chance.
 2014-06-27 12:05:15 +01:00
PsiOmega
596b71a4ff Adds support to better handle air alarms in sensitive areas and vents with custom settings. 
Air alarms now have a new setting, breach_detection, which allows for disabling the automatic mode change when a breach occurs.

Vents now have three new settings. These are primarily for when air alarms request a mode change to ensure that custom pressure levels/checks (in terms of mapping, not set later in game)  are not lost.
external_pressure_bound_default
internal_pressure_bound_default
checks_default
 2014-06-27 11:12:09 +02:00
Zuhayr
274a7a844a Merge pull request #5372 from mwerezak/emergency-shuttle 
More shuttle updates
 2014-06-27 18:36:37 +09:30
Ccomp5950
1ba345ca8c Teacup icon clipping fix. 
Might need to be done to coffee as well.

Thanks Serveris6 for the report:  http://prntscr.com/3wyah5
 2014-06-27 02:29:45 -05:00
Jarcolr
dda6ef82bd Psych bed >> Freudian couch 
Vetinarix kept the icon_state name when the Medbay Renovation PR thing got in. Malsquando wanted this changed.
 2014-06-27 10:22:05 +03:00
mwerezak
7ae03d127b Fixes macro escape slashes 
Derp.
 2014-06-26 20:48:07 -04:00
mwerezak
363df869e2 Improves the fix for shuttles being stuck if... 
... the docking controller is destroyed.
 2014-06-26 19:01:17 -04:00
Loganbacca
3aee224d12 Merge remote-tracking branch 'remotes/upstream/dev' into atmomerge 2014-06-27 10:18:17 +12:00
mwerezak
deb1e1007c Fixes ERT shuttle not announcing a cancelled... 
...launch if the launch is cancelled after the countdown is completed.
 2014-06-26 17:21:45 -04:00
Chinsky
2d52f2eac7 Merge pull request #5365 from volas/master 
Fix infinite loop
 2014-06-27 01:14:36 +04:00