Commit Graph

5063 Commits

Author SHA1 Message Date
TheDZD
69f6c178aa Merge pull request #3251 from Fox-McCloud/implant-refactor
TG Implant Refactor/Overhaul
2016-01-17 18:37:50 -05:00
TheDZD
b1e6f7c0a8 Merge pull request #3157 from DaveTheHeadcrab/blueshitgun
Blueshield: Advanced Stun Revolver
2016-01-16 23:17:54 -05:00
Fox-McCloud
ff9acaf730 Merge remote-tracking branch 'upstream/master' into implant-refactor 2016-01-16 20:52:36 -05:00
Fox McCloud
9e55d11fa9 Merge pull request #3178 from Aurorablade/insertlewdcommenthere
try to fix mindslave implant hud
2016-01-16 20:39:57 -05:00
Fox McCloud
fb50b53017 Merge pull request #3246 from Jey123456/altclickdeflate
alt click to deflate inflatable walls / doors.
2016-01-16 19:52:56 -05:00
Fox-McCloud
4558e0e8ae better pad 2016-01-16 19:48:13 -05:00
Aurorablade
f40daffbe8 I FIXED IT 2016-01-16 15:50:43 -05:00
Fox-McCloud
8c229280d2 consistency helps 2016-01-16 04:44:56 -05:00
Fox-McCloud
ec350a0b5c TG Implant Refactor/Overhaul 2016-01-16 01:50:10 -05:00
Jey
189ac6f4e6 -small change 2016-01-15 14:10:47 -05:00
Jey
6002ec00e1 simple quality of life tweak to the inflatable walls / doors.
Alt-click on an inflated one to deflate (same as the deflate option on right click)
2016-01-15 13:19:18 -05:00
Aurorablade
28a2980110 HALP HALP 2016-01-14 14:56:56 -05:00
Crazylemon64
de13a4e4d3 Various Ragin' Mages fixes
* Additionally, increases the number of memes in the codebase
2016-01-13 21:56:56 -08:00
Fox-McCloud
d1b90257c3 proper typecasting 2016-01-13 15:55:42 -05:00
Fox-McCloud
2541c8f4b6 faster loops 2016-01-13 09:08:53 -05:00
Aurorablade
53222772bc i almost want to give up on this 2016-01-13 03:37:45 -05:00
Fox-McCloud
eb5fcba6c5 Explosion Overhaul 2016-01-12 18:46:10 -05:00
Aurorablade
602d4c1c2f what am i even doing... 2016-01-12 16:22:42 -05:00
Fox McCloud
a2f944cfd9 Merge pull request #2722 from ZomgPonies/russian
Revolver Stuff
2016-01-11 00:18:21 -05:00
Fox-McCloud
df75c3418d tweak 2016-01-09 21:19:20 -05:00
Fox-McCloud
a2e825603e Adds in Tradable Telecrystals 2016-01-09 17:42:03 -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
SamCroswell
134e507ee6 Asset Protection Energy Gun 2016-01-08 00:27:51 -05:00
Fox-McCloud
4ed2f89872 Balances the Tesla 2016-01-07 16:43:38 -05: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
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
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
Tastyfish
65e2a7fdff Updates/fixes instrument ui to be a nanoui 2016-01-05 02:26:45 -05:00
Fox-McCloud
4221d033ab Slipping Refactor and Floors 2016-01-04 21:22:59 -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
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
TheDZD
6ec065b319 Merge pull request #3102 from Fox-McCloud/ert-fix
ERT Medical Belt Fix
2016-01-03 21:38:15 -05:00
Fox-McCloud
dfa55f1f35 ERT Medical Belt Fix 2016-01-03 21:23:49 -05:00
Fox-McCloud
e9d5c67371 securer crates 2016-01-03 21:02:48 -05:00
TheDZD
5555b00ff5 Merge pull request #3093 from Fox-McCloud/table-pushing-refactor
Table Pushing Refactor+Fix
2016-01-03 19:59:16 -05:00
TheDZD
cf77645cc7 Merge pull request #2853 from Regen1/Iamsodone
Nerfs the bag of holding + bag of holding effect
2016-01-03 11:34:08 -05:00
Fox-McCloud
7830cd215b shotgun 2016-01-03 04:03:48 -05:00
Fox-McCloud
0bb97a1636 Table Pushing Refactor+Fix 2016-01-03 02:12:31 -05:00
Fox McCloud
fb6f3e05d5 Merge pull request #3060 from RudiPardieck/materials
Material usage fixes
2016-01-01 17:34:44 -05:00
Certh
d69a691840 Dismantling table parts now returns same amount of metal as was used in construction 2015-12-31 12:07:22 +01:00