Commit Graph
5347 Commits
Author SHA1 Message Date
Chase Clary 605b4872e1 Should fix the custom item problem with Roaper's ID. I can't tell for sure though, because I have no way to test it. 2012-09-09 17:24:45 -05:00
Jim "Apples" dd8964b0eb Merge pull request #1706 from Asanadas/master
Adding 2 custom items
2012-09-08 04:02:48 -07:00
Chase Clary fa29365cf5 Should add Roaper's custom ID. 2012-09-07 19:18:07 -05:00
Asanadas a13b922ed8 My attempts at adding custom items for executivekill http://baystation12.net/forums/viewtopic.php?f=33&t=5156
and thejesster14
http://baystation12.net/forums/viewtopic.php?f=33&t=4936

Signed-off-by: Asanadas <asanadas@hotmail.com>
2012-09-07 17:59:01 -04:00
SkyMarshal cf04246f96 Revert "Random not much finished bullshit work on mapdata."
This reverts commit d3179bb5b5.
2012-09-06 15:51:23 -07:00
SkyMarshal 4d7b17208d Update for everyone wishing to make a spacecraft, has a small map file (7x9) of a effective supermatter reactor (untested) and some changes to allow TEG's to be rotated.
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
2012-09-06 15:48:11 -07:00
SkyMarshal 0532c59cb5 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-09-06 15:44:21 -07:00
Mloc 6229c4f2ab Merge pull request #1694 from comma/master
Fix for appendictomy not being possible without admin intervention.
2012-08-31 08:34:49 -07:00
Cael_Aislinn 1b307f26de custom item stuff: updated roaper(enos adlai) comfy hat sprite, added searif (ara al-jazari) classy bartender uniform, sirribbit (james mcreary) mcreary's journal, serithi (tribunal) custom ai sprites (player has manual selection of both normal and malf states), removed (commented out) searif's one nations flagmask
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-01 00:27:24 +10:00
Chinsky 4db98fa311 Fix for appendictomy not being possible.
For some reason organ, affected with scalpel (by organ.status |= BLEEDING) did not start to bleed.
That caused hemostat step to fail, and not advance appendix operation stage.
2012-08-31 17:16:31 +04:00
Mloc f53b079bb9 Merge pull request #1688 from comma/master
More wedding thingies
2012-08-26 11:05:38 -07:00
Chinsky a2114056f7 More dresses for the dress god!
Also cake closet sprite.
2012-08-26 22:02:40 +04:00
SkyMarshal ffa80e2e94 Ultralight update, less laggy and less buggy. Might still need to be removed, time will tell. Also: Added an Ion Storm law, and reverted the radio mode change back to the new subspace radios. Also added myself to the admins.txt since I am a dev again and the main server already is updated like that. 2012-08-21 17:25:57 -07:00
Erthilo caf88d81eb Merge pull request #1666 from SkyMarshal/master
Fixes for ZAS, including fire, geometry, rebuilding consideration, and atmospheric lockdowns.
2012-08-21 06:44:27 -07:00
SkyMarshal d41ffc18fd Fixes for ZAS, including fire, geometry, rebuilding consideration, and atmospheric lockdowns. In addition, improved supermatter, and humans now absorb all the oxygen they inhale, due to the ludicrous volumes of air normally encountered (Does not reduce effectiveness of air tanks) 2012-08-21 01:18:01 -07:00
Head 0ac265a56c Removed del logging. 2012-08-19 22:10:22 +02:00
SkyMarshal 4da0bc8873 Merge pull request #1657 from Erthilo/master
HUD updates, roach nerf
2012-08-19 00:03:07 -07:00
Nerezza 42cf977b4d Janitors now get gloves/mask for biohazards.
http://baystation12.net/forums/viewtopic.php?f=5&t=5222

That's the related poll. I feel that the results were an overwhelming yes, with no one not in favor.

Really, it's like how atmos tech lacked magboots after ZAS was put in. Why would the guy helping to stop the spread of viruses not have this gear?
2012-08-19 02:01:31 -05:00
Erthilo 6a6a97b551 Reduces roach damage. 2012-08-19 03:58:39 +01:00
Erthilo 72822c8978 SecHuds and MedHuds can now view appropriate records. MedHuds can now set Physical Status. 2012-08-19 03:57:44 +01:00
SkyMarshal 33f9beb560 Merge pull request #1654 from Erthilo/master
Mining lag reduction, sleepy pen, xenos, centcomm console
2012-08-18 18:34:10 -07:00
Erthilo 08b2b326e9 Ores now stack when released from ore box. Should help reduce some mining lag. 2012-08-19 01:59:53 +01:00
Erthilo a93db06afb Rebalanced sleepy pen, takes about 30 seconds to fall asleep, and 2 minutes total from stabbing to wear off. Fixes aliens, can no longer be pushed over by airflow, and all their powers work correctly. CentComm console has a 5 second cooldown now. 2012-08-18 21:32:21 +01:00
Mloc f7d1790608 Merge pull request #1652 from Erthilo/master
Lots of Fixes
2012-08-18 12:07:55 -07:00
Erthilo 560d83c1e7 Merge pull request #1645 from caelaislinn/master
misc
2012-08-18 12:05:11 -07:00
comma 737c96a1e6 Added FABULOUS white suit. 2012-08-18 21:58:00 +04:00
Erthilo d28385ca07 Fixes eggbox while in-hand. 2012-08-18 18:47:50 +01:00
Erthilo 13cff298ea Fixed cyborgs not being able to patch up girders. 2012-08-18 18:31:35 +01:00
Erthilo 88e41b1db1 Fixes mice not being able to ghost when using Re-enter corpse. 2012-08-18 18:31:18 +01:00
Erthilo a8c3cdbe42 Fixes some derpy naming with 's. 2012-08-18 18:30:58 +01:00
Erthilo 12c9cb1abf Fixes newcaster not showing news channels. 2012-08-18 18:30:22 +01:00
Erthilo 50945ba8ed Fixed not being able to have two roboticsts at game start. 2012-08-18 18:30:03 +01:00
Erthilo 7495991e75 Other part of mutation fix. 2012-08-18 18:29:12 +01:00
Erthilo 40287a4574 Fixes virology incubator making chemicals out of nowhere. 2012-08-18 18:28:52 +01:00
Erthilo f521a4b739 Fixes alien whitelist popup for those not using the whitelist. 2012-08-18 18:28:26 +01:00
Erthilo e68e49fdb9 Fixes simple_animal me command and mice making clonking noises in disposals. 2012-08-18 18:26:39 +01:00
Erthilo eff2a042bc Fixes incorrect accesses on mining lockers. 2012-08-18 18:25:56 +01:00
Erthilo 6fed058680 Fixes Tajarans and all mutant races spawning with no hair, etc. Partially fixes morph mutation. Fixes mutations. 2012-08-18 18:25:23 +01:00
Erthilo 7da0507c8a Hotfix for mice being able to use MouseDrop, fixing mice stripping people, donut boxes, etc. Also allows mice/parrots/kobolds/cats to die from low air or heat/cold. 2012-08-18 17:08:53 +01:00
comma f782298006 Fixes headless monkey curse (issue #1450) 2012-08-18 16:13:47 +04:00
comma 558e6a8b7f Added wedding dress, formal woman wear and STRIPPER GEAR. 2012-08-18 15:50:09 +04:00
comma d3bc199ca9 Does not decreases metroid core count on unsuccessful removal.
Fixes Issue #1625
2012-08-18 15:46:22 +04:00
Cael_Aislinn a629624a6d Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-08-18 15:02:33 +10:00
Cael_Aislinn 2f95d1d8cb missing helper proc to allow people to hear each other in the dark
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-18 04:41:20 +10:00
Mloc 78a507b752 Merge pull request #1640 from caelaislinn/master
fix for hearing through walls >.>
2012-08-17 11:39:28 -07:00
Cael_Aislinn aa43ad116c fix for hearing through walls
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-18 04:38:15 +10:00
Mloc 43def17087 Merge pull request #1623 from caelaislinn/master
misc
2012-08-17 06:55:37 -07:00
CubeJackal 66f0fab77e Set icon for dart shells to new sprite 2012-08-17 05:22:59 +01:00
Cael_Aislinn a7cd8f6361 added a depth limit (default of 3) to recursive_mob_check, may be a slight optimisation
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-16 13:27:53 +10:00
Cael_Aislinn 692daf2762 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-08-15 18:50:56 +10:00