Aurorablade
2bf91a4b2e
Adding back some stuff...but
...
still need to work some shit out
2016-01-09 23:54:29 -05:00
TheDZD
73225f6d5b
Merge pull request #3158 from Crazylemon64/RAEGIN'-MAEGES!!!
...
Fixes RAGIN' MAGES
2016-01-09 23:52:12 -05:00
Fox-McCloud
df75c3418d
tweak
2016-01-09 21:19:20 -05:00
Crazylemon64
e26212ddb3
Protects against a potential runtime if a wiz is qdel'd
2016-01-09 17:43:23 -08:00
Fox-McCloud
a2e825603e
Adds in Tradable Telecrystals
2016-01-09 17:42:03 -05:00
Crazylemon64
421c5688ab
Basic operation complete!
2016-01-09 02:46:49 -08:00
Crazylemon64
c6b5df6cfe
Gets things functional
...
My human-from-client-prefs runtimes like crazy, though
2016-01-09 02:25:07 -08:00
TheDZD
33f76d9f3b
Merge pull request #3153 from Fox-McCloud/hulk-balance
...
Hulk Balance
2016-01-08 19:26:07 -05:00
TheDZD
da141868a3
Merge pull request #3152 from Fox-McCloud/tesla-tweak
...
Balances the Tesla
2016-01-08 17:28:54 -05:00
TheDZD
82b12d1a34
Merge pull request #3164 from Fox-McCloud/uplink-fixes
...
Uplink and Syndicate Cyborg Fix
2016-01-08 17:28:40 -05:00
Fox-McCloud
a21d1b5221
Uplink and Syndicate Cyborg Fix
2016-01-08 17:07:33 -05:00
Crazy Lemon
33279f04ec
Fixes things around
2016-01-08 12:03:54 -08:00
Crazy Lemon
5174703c3c
Tweaks the mode to require less admin enforcement
2016-01-08 11:59:49 -08:00
Crazy Lemon
39af30fcd2
Tweaks alive counting - reduces possibility of camping
2016-01-08 11:42:09 -08:00
SamCroswell
04b4962128
Changes gun spawn location
2016-01-08 14:13:21 -05:00
Tigercat2000
88332b2bbc
Code: Fix stupid fucking space update_visuals runtime
...
Fixes #3142
In a stupid fucking way
2016-01-08 10:25:54 -08:00
Crazylemon64
9e4d1e8696
Fixes ragin mages, first pass
2016-01-07 22:58:04 -08:00
SamCroswell
134e507ee6
Asset Protection Energy Gun
2016-01-08 00:27:51 -05:00
Crazylemon64
6a9262d80d
Sleepers now rotate nicely
2016-01-07 18:16:13 -08:00
TheDZD
bbcac90906
Merge pull request #3135 from Fox-McCloud/timestop
...
Timestop Spell Port and Sepia Slimes
2016-01-07 19:56:45 -05:00
Fox-McCloud
39e9a420c3
Hulk Balance
2016-01-07 19:11:01 -05:00
Fox-McCloud
4ed2f89872
Balances the Tesla
2016-01-07 16:43:38 -05:00
Fox McCloud
7310c706ff
Merge pull request #3124 from Aurorablade/BlameRegens
...
Fethas Carnival of horrors:OH GOD WHY
2016-01-06 21:51:53 -05:00
Mark van Alphen
704694020c
Merge pull request #3136 from RudiPardieck/BodyScannerFix
...
Bugfix: Bodyscanner now shows robotic parts in internal organs
2016-01-06 18:38:14 +01:00
Fox McCloud
96f38d0ccd
Merge pull request #3120 from Tastyfish/nano-piano
...
Instrument UI updated to modern nanoui.
2016-01-06 03:45:43 -05:00
Fox-McCloud
ebdd9d3897
Timestop Spell Port and Sepia Slimes
2016-01-06 03:30:08 -05:00
Aurorablade
85c0c0be19
nya
2016-01-06 00:50:30 -05:00
Tigercat2000
986c687d27
Merge remote-tracking branch 'upstream/master' into lighttiles
...
Conflicts:
code/game/objects/items/stacks/tiles/tile_types.dm
2016-01-05 18:49:36 -08:00
Tigercat2000
a10d7d1bd2
fix lightfloors
2016-01-05 18:46:39 -08:00
TheDZD
3d316d9c66
Merge pull request #3116 from Fox-McCloud/slipping-floors
...
Slippery Refactor and Floors
2016-01-05 21:42:26 -05:00
TheDZD
ebdbe4627b
Merge pull request #3114 from Fox-McCloud/chem-master
...
Constructable Chem Master
2016-01-05 19:36:11 -05:00
TheDZD
73f6114b1f
Merge pull request #3112 from Fox-McCloud/object-verb-restore
...
Restores a Few Object Verbs
2016-01-05 19:35:55 -05:00
TheDZD
4dd3cd76bf
Merge pull request #3085 from Fox-McCloud/sec-rifle
...
Sec Rifle Port
2016-01-05 19:34:33 -05:00
Aurorablade
752adfe2ea
see branch title
2016-01-05 16:19:47 -05:00
Certh
99b1efa6a6
Bugfix: Bodyscanner now sees mechanical parts in internal organs
2016-01-05 21:29:46 +01:00
Tastyfish
65e2a7fdff
Updates/fixes instrument ui to be a nanoui
2016-01-05 02:26:45 -05:00
Fox McCloud
1842b708cb
Merge pull request #3118 from Aurorablade/ValidCloning
...
Fixes antag huds showing after cloneing for solo antags
2016-01-05 00:28:42 -05:00
Aurorablade
3bfb86a2f1
Boop
2016-01-05 00:23:08 -05:00
Aurorablade
b2d2de16f4
antaf huds should no long be shown after clowning
...
i made typos in that commit message..it amuses me too much to fix.
2016-01-05 00:14:11 -05:00
Fox-McCloud
4221d033ab
Slipping Refactor and Floors
2016-01-04 21:22:59 -05:00
Fox-McCloud
51851e9ec5
Constructible Chem Master
2016-01-04 18:23:41 -05:00
Fox-McCloud
b69eb0a408
better checks and fingerprints
2016-01-04 16:53:35 -05:00
Fox-McCloud
a7d1bcce4e
Restores a Few Object Verbs
2016-01-04 16:42:53 -05:00
Crazylemon
b06d542d50
Fixes a flipped conditional that made welders unreadable
2016-01-04 10:10:50 -08:00
Aurorablade
948adea83b
Added Asses as an organ
...
...made you look...
seriously though, refined some surgery datums/steps and commiting so i
can go bugfix some stuff...and a sidequest...i need to adjust return
values.
2016-01-04 08:25:39 -05:00
Fox-McCloud
38149bfc7d
Merge remote-tracking branch 'upstream/master' into sec-rifle
2016-01-03 22:35:28 -05:00
Fox McCloud
103372e92b
Merge pull request #3037 from KasparoVy/master
...
Adds Body Marking Customization, Head Accessories, Revises Unathi Customization, Related Minor Fixes, etc.
2016-01-03 22:33:40 -05:00
Fox McCloud
9c863e5259
Merge pull request #3092 from tigercat2000/tgsmooth
...
-tg- Smoothing/Floor refactor
2016-01-03 22:28:50 -05:00
Tigercat2000
31aab5452b
-tg- smoothing/floor refactor
...
Squashed:
Add plasteel goonplaque turf
Builtin_tile nulling
Levelupdate()
Fix falsewalls, update smoothing.dmm
fixes rwall decon
2016-01-03 19:24:13 -08:00
Fox McCloud
955eae12ff
Merge pull request #3100 from RudiPardieck/AtmosMonitorBugfix
...
Bugfix for atmos monitor
2016-01-03 21:47:01 -05:00
