Jamini
f05c44dc23
Praying this works
...
Added Lockable lockers for atmos techs
Adjusted equipment in lockers
Adjusted wardrobe lockers
Added Engineering berets
Rearranged equipment in engineering
Signed-off-by: Jamini <mobiousjami@gmail.com >
2013-08-13 18:57:08 -04:00
Mloc-Argent
7ac43fa871
Merge branch 'master' into dev
2013-08-13 22:21:37 +01:00
Mloc-Argent
e2e747fa0a
Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev
2013-08-13 22:21:09 +01:00
Mloc-Argent
310283f581
Merge branch 'master' into dev
2013-08-13 22:20:39 +01:00
meyar
551fee16eb
Removes nook awps stunlock. Nerfs SAW back to where it should be, 25 damage, not 60. Fuckin' SAW.
2013-08-13 16:51:48 -04:00
meyar
e74782bbdb
Unfucks pepper spray. IT ACTUALLY DOES THINGS NOW. KO spray replaced with stun/weaken.
2013-08-13 16:51:15 -04:00
meyar
2819b6ac96
Gives IA security headsets as DEMOCRACY'D here: http://baystation12.net/forums/viewtopic.php?f=5&t=8096
2013-08-13 16:49:17 -04:00
meyar
70176f7132
Gives those asshole greyshirts fukkin' air tanks. The fucks.
2013-08-13 16:45:46 -04:00
Zuhayr
bbfe26bde8
Merge pull request #3503 from Mloc/master
...
Fully reverts clickdelay change.
2013-08-13 05:20:35 -07:00
Mloc-Argent
71bdaa1698
Fully reverts clickdelay change.
...
It was immensely buggy with certain mobs, and server lag all but negated the benefits.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-13 13:10:09 +01:00
Segrain
3ba5c3e450
Compile fix.
2013-08-13 13:47:22 +03:00
Segrain
2de41230c9
Merge remote-tracking branch 'upstream/master'
2013-08-13 13:41:24 +03:00
Segrain
6122d50ce0
Reverting to as advertised.
2013-08-13 09:25:28 +03:00
Segrain
ccb87c446a
Vox beards.
2013-08-13 09:21:28 +03:00
Chinsky
52397321b2
Merge pull request #3502 from Zuhayr/master
...
Compile fix.
2013-08-12 22:36:51 -07:00
Zuhayr
b820ce2fe6
Compile fix.
2013-08-13 15:36:05 -07:00
Zuhayr
b10fe26a9e
Typo fix.
2013-08-13 15:18:45 -07:00
Zuhayr
98510b3b01
Added the ability for worms to secrete useful chemicals.
2013-08-13 15:06:11 -07:00
Zuhayr
4f3f3d6eff
Added vent crawl, hiding and table passing to brain slugs.
2013-08-13 14:55:29 -07:00
Zuhayr
86c66ebcd4
Possible fix to weird podman behavior.
2013-08-13 14:51:39 -07:00
Zuhayr
b131d22717
Fixes Check Antagonists for Heist mode.
2013-08-13 14:26:39 -07:00
Zuhayr
254cef453a
Added a preferences switch for diona.
2013-08-13 14:16:07 -07:00
Chinsky
bcb1ced44a
Merge pull request #3500 from Zuhayr/master
...
Borer, plantman and Heist fixes.
2013-08-12 22:19:14 -07:00
Erthilo
1228ba8a25
Allows autoinjectors to be refilled.
2013-08-12 21:17:16 +01:00
Mloc
3a85e7afb2
Merge pull request #3495 from Zuhayr/master
...
Vox carryover fixes.
2013-08-12 07:03:55 -07:00
Zuhayr
bed45dd864
Removes Vox flavour text carried over from chargen.
2013-08-13 00:03:14 -07:00
Zuhayr
4874d5691b
Removes multicultural mrowling Vox from Heist.
2013-08-13 00:00:34 -07:00
Zuhayr
44aa77f7de
Adds a delay to the RCD when building.
2013-08-12 22:51:27 -07:00
Zuhayr
5476ae192d
Attempting to reduce incidence of clickspam against mobs.
2013-08-12 22:44:57 -07:00
Zuhayr
82a4dedf5d
Snowflake check for Soghun. FIX THE WHITELIST THING, HEAD.
2013-08-12 21:17:38 -07:00
Mloc
82eb19df9a
Merge pull request #3493 from Zuhayr/master
...
Click delay fixes (part 1)
2013-08-12 05:58:46 -07:00
Erthilo
9d1bbb16d0
Adds explosive implant admin messages, and jump button for explosions.
2013-08-12 12:34:13 +01:00
Zuhayr
e748fdeb0c
Merge pull request #3488 from Baystation12/dev-freeze
...
Dev freeze
2013-08-11 22:00:01 -07:00
Zuhayr
bcad5a787d
Fixed listing of unrelated creatures when infesting.
2013-08-12 14:46:03 -07:00
Zuhayr
5ecee57a2c
Fixed failure to remove borer verbs on successful resist.
2013-08-12 14:45:42 -07:00
Zuhayr
b23c685221
Borer surgery fix.
2013-08-12 13:44:51 -07:00
Zuhayr
5f0515fb50
Further borer tweaks.
2013-08-12 13:36:21 -07:00
Zuhayr
16e976035f
Cortical borer fixes.
2013-08-12 11:50:14 -07:00
Segrain
eb55fb2da2
Revive fix.
2013-08-12 05:30:39 +03:00
Zuhayr
375437a6cf
Changelog merge. I hate the changelog.
2013-08-12 11:20:41 -07:00
Erthilo
459aafd523
Fixed borg sprites no resetting with reset board.
2013-08-11 21:32:02 +01:00
Erthilo
166a7e57a6
Cult 'raise' rune how completely heals raised corpse.
2013-08-11 17:38:12 +01:00
Erthilo
070cb50f8d
PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too.
2013-08-11 17:13:58 +01:00
Mloc-Argent
7ba1638e11
Fixed some mob clicks.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-11 15:52:48 +01:00
Zuhayr
29ad858ed4
Fixes the weird inertia behavior of cuffed/dragged people in space.
2013-08-11 23:52:46 -07:00
Mloc
7e00df0a56
Merge pull request #3473 from Zuhayr/master
...
Commented out gold slime core reactions.
2013-08-11 06:34:38 -07:00
PlasticDingus
672a810f44
New decorative object
...
So having gotten a (weak) grasp of Git and and creating objects, I'm
submitting my first commit. It's a simple potted plant decorative
object.
If there's something wrong, please let me know. I'm still quite new to
contributing to the game.
2013-08-11 02:49:02 -04:00
Segrain
935a7f30ea
Typo fix.
2013-08-11 09:22:20 +03:00
Zuhayr
a8c892a938
Fixes Heist check_antag verb.
2013-08-11 14:03:46 -07:00
Zuhayr
2ce91a3fbc
Commented out gold slime core reactions.
2013-08-10 18:19:41 -07:00
