Commit Graph

26998 Commits

Author SHA1 Message Date
uraniummeltdown
bca7b3602c renames assembly_type to assemblytype for parity with tg
moved a few door and airlock procs around to more sensible positions
removed useless vars on some airlocks in airlock_types.dm
lowercased all airlock/door objects
2017-11-09 15:23:15 +04:00
uraniummeltdown
152f6b7f39 moved most airlock types to airlock_types.dm 2017-11-09 12:21:55 +04:00
uraniummeltdown
e509704709 removes var/frozen from airlocks, only used in a removed away mission (clown planet)
removes the frozen overlay from airlock/door icon files
2017-11-08 22:52:12 +04:00
uraniummeltdown
9f61f0589f lowercases default door names
moves var/welded to door level
renames poddoor "Podlock" to blast door
all doors use power_channel ENVIRON
2017-11-08 22:25:42 +04:00
Aurorablade
36e0e8832a F 2017-11-05 21:43:50 -05:00
Fox McCloud
18cbce0ec6 Merge pull request #8350 from KasparoVy/fix_hair_dye
Fixes Barber's Dye Bottle
2017-11-05 17:33:45 -05:00
KasparoVy
727cf1998a Fixes Barber's Dye Bottle
My own bad, I changed the way mob colours are handled without updating
dye bottles.
Ironically, it seems I'd already sorted out the OTHER kind of hair dye
(the reagent).
2017-11-05 17:20:56 -05:00
Aurorablade
3a63b17657 guardian runtime 2017-11-05 01:10:34 -05:00
Crazy Lemon
7ceffd1098 Merge pull request #8343 from Fox-McCloud/remote-talk-metagaming
Fixes Remote Talk Metagaming
2017-11-04 18:51:55 -07:00
FalseIncarnate
66f10657bd fix merge conflicts (again) 2017-11-04 17:37:30 -04:00
Fox-McCloud
f6d64455ff Fixes Remote Talk Metagaming 2017-11-04 16:05:57 -04:00
Ansari
266a96a23c remove redundant you 2017-11-02 11:23:55 +08:00
Crazy Lemon
63ad6a2efb Merge pull request #8131 from MarsM0nd/Holofix
Makes holograms end when they should
2017-11-01 10:14:10 -07:00
Crazy Lemon
961676d097 Merge pull request #8286 from Aurorablade/CultPassSprites
Cult Pass Split:Sprites
2017-11-01 10:12:40 -07: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
Crazy Lemon
7c55215cc9 Merge pull request #8324 from naisudev/master
Adds the GitHub button
2017-10-30 14:18:27 -07:00
Aurorablade
0984c623e1 adds tome 2017-10-29 17:57:56 -04:00
tigercat2000
7ca26db3f3 Merge pull request #8285 from Aurorablade/CultPasBalance
Cult Pass split: Balance shit
2017-10-29 11:17:39 -07:00
tigercat2000
2ba2bcbfb1 Merge pull request #8298 from Allfd/ionfix
Ion Rifles are not pistols
2017-10-29 11:14:54 -07:00
tigercat2000
5303242597 Merge pull request #8315 from Anasari/SyndicateBalanceTatorOnly
Syndicate Item Rebalance PR. Tator Items Only.
2017-10-28 17:56:24 -07:00
Ansari
51160cdfab Hacked AI module cost changed back to 14 2017-10-29 08:07:28 +08: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
a90f6aa0ce Merge pull request #8313 from Kyep/vamp_jaunt_fix
200th PR: Fixes vamp jaunt/shadowstep working on z2
2017-10-28 13:53:31 -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
naisudev
f46afcc78c added githuburl value 2017-10-28 22:43:43 +03: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
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
Ansari
f11f0cd3bb Syndicate Rebalance PR. Tator Items Only. 2017-10-27 08:08:53 +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
tigercat2000
82d8ef8ce4 Merge pull request #8290 from Kyep/tourist_fix
Fixes all-access Soviets
2017-10-26 15:36:01 -07:00
tigercat2000
13edd0a91d Merge pull request #8288 from FreeStylaLT/paramedics_anti_theft_movement
Moves Paramedic's key from his clothes-locker to his EVA locker, removes an extraneous helmet from Paramedic's EVA locker
2017-10-26 15:32:53 -07:00
tigercat2000
46d46f50a3 Merge pull request #8287 from FreeStylaLT/icon_update
Adds a bunch of sprites for Medbay areas
2017-10-26 15:31:41 -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
Kyep
4084ab3f35 Fixes vamp jaunt/shadowstep working on z2 2017-10-26 04:12:58 -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