Chinsky
4118d183c1
No fun allowed.
...
Fixes some hilarious stool glitches.
2013-06-08 05:27:32 +04:00
MisterBook
99e2afb6bc
Response team is unticked? Dunno if it's ready or not, but will not commit while that verb is live.
2013-06-07 12:45:02 -05:00
MisterBook
b168f684bf
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-07 12:32:52 -05:00
MisterBook
e05a20ad6f
Putting VOX back in.
2013-06-07 12:31:38 -05:00
Chinsky
1e84d99d5f
Merge pull request #2985 from Kilakk/bleeding-edge-freeze
...
Adds emergency response team verb
2013-06-07 04:57:12 -07:00
Chinsky
76d1ddaa26
Merge pull request #2963 from Ravensdale/master
...
Robot bug fix, synthetic custom sprites update and a rune text tweak
2013-06-07 04:45:00 -07:00
Giacomand
796a498993
* Reverted accidental admins.txt change.
2013-06-07 06:44:33 +01:00
Giacomand
be5df62fb4
Committing .wav files.
2013-06-07 06:29:23 +01:00
Giacomand
fa39b4e520
New AI voice announcement system which allows the AI to create sentences by combining snippets of words.
2013-06-07 06:29:21 +01:00
Kilakk
faf5b86e49
Changed the way ERTs are selected
...
* Ghosts get a pop-up thingy that asks them if they want to be
considered
* Ghosts that're antag-banned and/or jobbanned from security officer are
exempt
* 30 second timer because timers are !!FUN!!
2013-06-06 23:29:15 -04:00
jack-fractal
29bffb0c20
Merge branch 'master' into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
2013-06-06 21:32:08 -04:00
MisterBook
05083f4f48
Creating parent class for swimsuits.
2013-06-06 20:24:25 -05:00
MisterBook
1246e985f3
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-06 19:50:55 -05:00
MisterBook
8e401489e7
Making sure I don't break anyone else calling apply_effects.
2013-06-06 19:50:32 -05:00
jack-fractal
17b8a2dc8a
- reverting a change I hadn't accounted for to the luminosity of the PDA's flashlight
2013-06-06 20:50:22 -04:00
jack-fractal
f4441b5019
refactoring the Stat function for silicon lifeforms
...
adding messenger functions to cyborgs and refactoring the AI's IM system
2013-06-06 20:46:46 -04:00
Chinsky
0e808c0c9c
Merge pull request #2986 from meyar/master
...
Map fix: Chemistry disposal
2013-06-06 17:17:46 -07:00
meyar
9779a2e204
Chaaaaaange
2013-06-06 18:28:37 -04:00
meyar
ed90afb81a
Fixes a piping error in chemistry
2013-06-06 18:26:48 -04:00
Kilakk
3866943769
Adds the "Response Team" landmark to the ERT room
2013-06-06 17:05:07 -04:00
Kilakk
d1faeac8d8
Adds emergency response team verb
...
* Adds a verb for (b)admins in "Special Verbs" that lets you spawn in an
emergency response team a la deathsquid-button
* Spawned-in ERTs can choose their own ridiculous name
* Command alerts, because everyone loves those
2013-06-06 17:04:49 -04:00
Chinsky
466f930e63
Merge pull request #2982 from Zuhayr/master
...
Vox icons, stuff from master.
2013-06-06 02:35:49 -07:00
Chinsky
3eac748920
Merge pull request #2974 from misterbook/bleeding-edge-freeze
...
Bleeding edge freeze - The Pain Baby
2013-06-06 02:34:50 -07:00
Zuhayr
83aa5c3eef
Vox icons.
2013-06-06 10:42:23 +09:30
Zuhayr
58cbb7acf8
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-06 10:41:08 +09:30
Zuhayr
df75d25cb3
Map conflict, using BEF.
2013-06-06 10:40:22 +09:30
MisterBook
eab6f4fc44
Taser fix v.3.2
...
Now accounts for multiple layers of armor.
I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.
I also fixed whistle.dm
2013-06-05 19:37:29 -05:00
MisterBook
a34174e124
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-05 18:39:43 -05:00
Chinsky
e22156aa8c
Merge pull request #2981 from SkyMarshal/zas-cleanup
...
Runtime fix.
2013-06-05 14:54:32 -07:00
SkyMarshal
50735caf29
Runtime fix.
...
ZMerge was trying to combine lists without checking for existence.
2013-06-05 15:51:43 -06:00
Chinsky
211fc25f0d
Should probably slap it here, OR ELSE.
2013-06-05 21:58:27 +04:00
MisterBook
3eb7cf7315
Pull from BEF
2013-06-05 12:40:12 -05:00
Chinsky
cfbc3e5352
Added webbing and vests to lockers.
2013-06-05 21:35:56 +04:00
Chinsky
1425b6d440
Merge pull request #2978 from Segrain/master
...
Opening firelocks for exosuits.
2013-06-05 10:18:42 -07:00
Segrain
65893426ba
Bumping into firelocks in exosuit.
2013-06-05 21:02:25 +03:00
Chinsky
7023ed0a52
Added webbings and vests.
...
Attach to jumpsuit. Use Look in storage verb (Object tab) to open. Click on storage boxes to add items.
2013-06-05 21:17:22 +04:00
Chinsky
65880df974
Clicking on storage boxes now properly puts stuff in storage.
...
Stole fix from TG.
2013-06-05 19:43:01 +04:00
Chinsky
57c1ebb285
Merge pull request #2977 from MagmaRam/master
...
Fix for security belts not holding all seven items sometimes
2013-06-05 06:21:47 -07:00
MagmaRam
ae697179c9
Fix for security belts not holding all seven items if the total combined w_class of the items is over 14. They should now be able to hold seven of any items that fit in them.
2013-06-05 20:14:11 +07:00
Chinsky
9a930d0c50
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-05 15:46:45 +04:00
Chinsky
e9f6235ba1
Merge pull request #2976 from Zuhayr/master
...
Vox items and mutantrace plus a ton of shit from master.
2013-06-05 01:43:20 -07:00
Chinsky
106d68c2d2
Merge pull request #2975 from meyar/master
...
Map fixes and a PDA tweak.
2013-06-05 01:38:17 -07:00
Zuhayr
06f04e6374
Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite.
2013-06-05 17:35:38 +09:30
Zuhayr
114e04ee9f
Icons for vox.
2013-06-05 17:33:52 +09:30
meyar
4547248351
changelog
2013-06-05 01:28:26 -04:00
Zuhayr
9e71180e1b
Merge conflict resolution, using BEF.
2013-06-05 14:22:04 +09:30
MisterBook
f240edcdb8
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-04 22:42:45 -05:00
MisterBook
fd8d61aa8b
New taser fix is now in place. Rather than full deflection, armor mitigates the damage. Updates along all sorts of Clothing for minor mitigations to major mitigations.
...
New define - AGONY. Used as an effect (Like STUN, WEAKN, etc) to cause HALLOSS. Allows use of HALLOSS projectiles without having to worry about them shattering windows/grilles. Future use? Torture tools, pain inducers for interrogation, 'Be Good' modules, Meme, etc.
HALLOSS now regens while standing up (2 per tick), and laying down (Resting, unconscious, paralyzed - 6 per tick). This fixes the 'real damage + HALLOSS = forever crit'.
Sticking a gun in your mouth (Non-stun, damage inducing) and pulling the trigger kills you.
Icon adjustments.
2013-06-04 22:41:23 -05:00
Asanadas
86312c83a8
Merge pull request #2973 from Asanadas/master
...
Quickfix for posibrain.dm
2013-06-04 18:50:27 -07:00
Asanadas
29f2f4e7aa
Quickfix for posibrain.dm , posibrains booting ghosts that try to join them. Credit to Zuhayr for the fix!
2013-06-04 21:44:42 -04:00
