Zuhayr
cbb36ce24f
Added ability for tanks to be held on vox suits.
2013-06-10 18:08:25 -07:00
Zuhayr
630db203f9
Oxygen toxicity fix. Whoops.
2013-06-10 17:50:15 -07:00
Zuhayr
bc2db268cc
Vox oxygen toxicity, vox breath mask, nitrogen tank for spawning.
2013-06-10 17:16:54 -07:00
Zuhayr
38b44b2441
Items for wizard den, mental focus added to spellbook.
2013-06-10 14:56:47 -07:00
Zuhayr
85b945cfbf
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-10 14:42:46 -07:00
Chinsky
eab367972d
Merge pull request #3013 from Segrain/master
...
Special Operations crate.
2013-06-09 00:31:08 -07:00
Chinsky
7076db3caf
Merge pull request #3011 from Kilakk/bleeding-edge-freeze
...
ERTs can change their appearance upon spawn-in
2013-06-09 00:30:53 -07:00
Chinsky
ddc1d4fa51
Merge pull request #3010 from CIB/feature
...
Weights the likelihood of command positions by your age.
2013-06-09 00:30:34 -07:00
Segrain
673f3ddb37
Fix for ordering hidden supplypacks.
2013-06-09 10:25:27 +03:00
cib
8c6b8add20
Weights the likelihood of command positions by your age.
...
For most head positions, a good age is between 25 and 60, with ages towards the middle of that being even better. 25 because I figure for stuff like research, engineer etc. they'll want someone with fresh knowledge. Captain's best age starts at 35 though, due to that being an "old geezer job".
2013-06-09 01:13:13 +02:00
Kilakk
5ca6c970fb
Reticked and uncommented ERT
...
It's time
2013-06-08 18:52:41 -04:00
Kilakk
a5609c8150
Adds ability to change appearance for ERTs
...
* ERTs can change their own appearance
* Fixed an if statement I goof'd
2013-06-08 18:51:26 -04:00
Chinsky
6d1dabf3dd
Merge pull request #3004 from Zuhayr/master
...
Psychic villain gear.
2013-06-08 02:23:37 -07:00
Zuhayr
8b518f5639
Sprites and equipment for a psychic villain wizard variant. Mental focus is fairly experimental.
2013-06-08 19:20:02 -07:00
Chinsky
55d447afe0
Merge pull request #3003 from Baystation12/BEF-staging
...
Bef staging
2013-06-08 00:04:56 -07:00
Chinsky
e9b451ab0c
Merge pull request #3002 from comma/bleeding-edge-freeze
...
Bleeding edge freeze
2013-06-07 21:01:35 -07:00
Chinsky
7b0c4c85e8
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
maps/tgstation.2.1.0.0.1.dmm
2013-06-08 07:59:57 +04:00
Chinsky
24ce65617d
Merge pull request #2999 from comma/bleeding-edge-freeze
...
Bleeding edge freeze
2013-06-07 18:58:08 -07:00
Chinsky
e40140be03
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
maps/tgstation.2.1.0.0.1.dmm
2013-06-08 05:55:42 +04:00
Chinsky
0c6f518422
Merge pull request #2990 from jack-fractal/bleeding-edge-freeze
...
Android Clocks and Instant Messengers
2013-06-07 18:30:55 -07:00
Chinsky
1ce1927c0f
Merge pull request #2991 from misterbook/bleeding-edge-freeze
...
Bleeding edge freeze
2013-06-07 18:28:33 -07: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
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
MisterBook
3eb7cf7315
Pull from BEF
2013-06-05 12:40:12 -05: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
