FalseIncarnate
cd3fded79e
Contortionist Jumpsuit fix
...
Fixes the name of the Contortionist's jumpsuit actually being
"Contortionist's Jumpsuit". It is now named "atmospheric technician's
jumpsuit", as it is meant to look exactly like a atmos tech jumpsuit.
Also gave the suit the FIRE_PROOF burnstate, meaning it won't burn to
ash, again mimicing the atmos tech jumpsuit.
It does NOT however have the ONESIZEFITSALL flag, so fatties can't wear
it (you're squeezing into a tight space anyways, it makes more sense it
won't fit the huskier of spessfolk).
🆑
tweak: The Syndicate has determined that subtle and stealthy items don't
benefit from obvious names, and thus have rebranded their contortionist
jumpsuit.
tweak: The Syndicate decided to be less stingy than Nanotrasen and made
the contortionist jumpsuit out of flame resistant materials. You may
burn, but the jumpsuit won't!
/🆑
2017-11-14 00:29:19 -05:00
tigercat2000
19adf0bfa5
Merge pull request #8279 from msgerbs/master
...
Fixes weirdness when a mob being force-fed finishes a snack
2017-11-13 07:55:20 -08:00
tigercat2000
df0b404252
Merge pull request #8365 from Allfd/ambulance
...
Atmos Fix
2017-11-13 07:54:05 -08:00
tigercat2000
0dcfd4de5a
Merge pull request #8342 from Fox-McCloud/food-recipe-fix
...
Fixes Enchilada Food Recipe
2017-11-13 07:53:33 -08:00
tigercat2000
b4fa39d940
512 Compilation & Travis
2017-11-11 09:50:21 -08:00
Alffd
a2e9258b7b
Atmos Fix
2017-11-11 00:10:21 -05:00
Crazy Lemon
86676221b5
Merge pull request #8242 from Allfd/vamp
...
Makes vampires more containable
2017-11-10 12:29:43 -08:00
Alffd
a1c085ac0c
Makes blood loss more reasonable
2017-11-10 14:03:02 -05:00
tigercat2000
612d81a906
Merge pull request #8291 from Anasari/AssumingGender
...
Stop assuming gender.
2017-11-10 10:15:17 -08:00
tigercat2000
5450fe3e73
Merge pull request #8338 from Anasari/NorthernHair
...
Add in 79 polaris hairstyles
2017-11-10 09:59:53 -08:00
Aurorablade
36e0e8832a
F
2017-11-05 21:43:50 -05:00
FalseIncarnate
66f10657bd
fix merge conflicts (again)
2017-11-04 17:37:30 -04:00
Fox-McCloud
58724b4b73
Fixes Enchillada Food Recipe
2017-11-04 15:46:35 -04:00
Ansari
d77748fd70
Fix Doublebun & Bun4 not working.
...
TRAVIS SAMA DELIVER ME
2017-11-02 21:35:25 +08:00
Ansari
eb65912c14
Add in 3 missing hairstyle to the code. Remove redundant Joestar & Doublebuns from dmi file.
2017-11-02 20:09:08 +08:00
Ansari
4e9196f5ae
Port in 77 hairstyles from Polaris
2017-11-02 17:35:58 +08:00
Ansari
266a96a23c
remove redundant you
2017-11-02 11:23:55 +08:00
Crazy Lemon
8ad740ffd4
Merge pull request #8321 from Kyep/fix_freedom_suit
...
Fixes Freedom Op suits going red when toggled
2017-11-01 09:57:09 -07:00
tigercat2000
2ba2bcbfb1
Merge pull request #8298 from Allfd/ionfix
...
Ion Rifles are not pistols
2017-10-29 11:14:54 -07:00
VexingRaven
b5d4c80d30
Fixes weirdness when a mob being force-fed finishes a snack
2017-10-28 18:22:06 -05:00
FalseIncarnate
c1e1dc22d8
merge conflict fix
2017-10-28 18:38:20 -04:00
tigercat2000
138b376796
Merge pull request #8319 from Landerlow/sake
...
Adds sake to hacked booze dispenser
2017-10-28 14:19:06 -07:00
tigercat2000
d7770cdb56
Merge pull request #8309 from Squirgenheimer/typofix
...
Fixes small typo for energy crossbow design datum
2017-10-28 13:52:43 -07:00
tigercat2000
317067b7cf
Merge pull request #8301 from Kyep/ghost_hud
...
Improves Ghost HUDs
2017-10-28 13:50:14 -07:00
Crazy Lemon
4c48d24967
Merge pull request #7776 from tigercat2000/radio_comms_fluff
...
Air Traffic Control & Map Lore
2017-10-28 12:42:56 -07:00
Kyep
96beb024fa
Fixes Freedom Op suits going red when toggled
2017-10-28 00:21:26 -07:00
Birdtalon
f6708a200b
disables my tickets and fixes open ticket panel
2017-10-27 19:26:10 +01:00
Landerlow
78daffe4ae
Adds sake to hacked booze dispenser
2017-10-27 18:36:59 +02:00
tigercat2000
12949e24f8
Merge pull request #8184 from Birdtalon/ticket-machine
...
Birdtickets: Adminhelp based ticket system
2017-10-27 09:24:06 -07:00
tigercat2000
a5e4ccdc18
Merge pull request #8103 from FalseIncarnate/reagents
...
Silver Slime Core and Random Reagent changes
2017-10-27 09:23:50 -07:00
Ansari
83a81e01dd
\himself
2017-10-27 19:48:06 +08:00
FalseIncarnate
58bfb314d0
compromise
2017-10-26 21:01:05 -04:00
tigercat2000
c0db96a1fb
Merge pull request #8208 from Anasari/STAWPBREAKINTHELAWS
...
Change some phrases for brain damage and add some more
2017-10-26 17:50:38 -07:00
Ansari
b48105d1cd
>my face
2017-10-27 08:31:24 +08:00
tigercat2000
9be3546996
Merge pull request #8294 from TDSSS/ERT-comms
...
Adds code for ERT to com channel list
2017-10-26 15:52:05 -07:00
tigercat2000
6d467aa9f1
Merge pull request #8289 from Kyep/freedom_operatives
...
Adds Freedom Operatives
2017-10-26 15:38:45 -07:00
Birdtalon
11e1bd2f5d
requested changes
2017-10-26 22:04:51 +01:00
tigercat2000
2e01b435cc
Metastation is named, finally! NSS Cerebron. Also tweaks the delays.
2017-10-26 12:10:29 -07:00
tigercat2000
8a588d3aad
Merge remote-tracking branch 'upstream/master' into radio_comms_fluff
2017-10-26 12:02:31 -07:00
tigercat2000
1f71d87332
Merge pull request #8273 from Kyep/ert_orders
...
ERT Spawn Tweaks
2017-10-25 16:42:30 -07:00
Crazy Lemon
e1d7dbbfaf
Merge pull request #8158 from tigercat2000/nano_ui_tiger_edition
...
NanoUI Update/Refactor/Buildscript Rewrite
2017-10-25 16:14:15 -07:00
Crazy Lemon
b31110c0e8
Merge pull request #8270 from Kyep/ert_slots
...
ERT Configuration
2017-10-25 14:55:54 -07:00
Crazy Lemon
160ed56876
Merge pull request #8269 from Anasari/nosenseofhumour
...
Fix preference description
2017-10-25 14:49:06 -07:00
Crazy Lemon
11b597dffb
Merge pull request #8266 from Kyep/perms_panel
...
Headmins get Loopy Permissions
2017-10-25 14:47:44 -07:00
Squirgenheimer
66b7b26b21
Fixes typo for energy crossbow
2017-10-25 10:10:43 -04:00
Kyep
e3bdc978c5
Improves ghost HUDs
2017-10-24 00:27:16 -07:00
Alffd
e72d2852c2
Ion Rifles are not pistols
2017-10-23 19:00:12 -04:00
TDSSS
c0026cbec0
Now using $ as symbol for ert channel
2017-10-23 14:48:51 +02:00
Ansari
c700aa38ed
Change "my face". Add spessship to first phrase.
2017-10-23 07:20:53 +08:00
TDSSS
e83e8d581c
Welp, o is in use as well. I think ! should be unused, though. I've checked all the places I can think of, but maybe I overlooked some.
2017-10-23 00:42:40 +02:00
