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
Fox-McCloud
eb5fcba6c5
Explosion Overhaul
2016-01-12 18:46:10 -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
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
Certh
4082b59797
Dismantling girders now returns the same amount of metal as was used in construction the girders
2015-12-31 11:42:55 +01:00
Certh
54cffd53b4
Creating pool tables no longer uses up the entire stack of grass
2015-12-31 10:29:57 +01:00
KasparoVy
eb47c80d75
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2015-12-30 18:16:17 -05:00
KasparoVy
135475332b
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2015-12-30 17:41:26 -05:00
Fox McCloud
e67450d56d
Merge pull request #3025 from Crazylemon64/infinite_antags
...
Infinite antag tags
2015-12-30 13:52:41 -05:00
TheDZD
6433e3fc41
Merge pull request #3043 from Fox-McCloud/elite-syndi-hardsuit
...
Ports Elite Syndicate Hardsuit and Uplink Refactor
2015-12-30 13:49:39 -05:00
Regen
7a51db1f2f
keep the !!FUN!!, remove !!ACCIDENT!!
2015-12-29 17:58:19 +01:00
Fox McCloud
1343ad658f
Merge pull request #3041 from tigercat2000/cleaningrr
...
Cleaning time~
2015-12-28 23:28:14 -05:00
KasparoVy
673a50132c
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2015-12-28 19:18:34 -05:00
Fox-McCloud
0f03947d55
Ports Elite Syndicate Hardsuit and Uplink Refactor
2015-12-28 08:37:27 -05:00
Tigercat2000
9cb84e83ca
Clean old shit, delete old files, move files, mrowl
2015-12-27 15:58:41 -08:00
KasparoVy
6ba20458e5
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
...
# Conflicts:
# icons/mob/human_face.dmi
2015-12-27 18:42:59 -05:00
Crazylemon
23e8b1277f
Wave 2 of tweaks, probably needs a little more
...
Ripped out the preferences_savefile.dm because it's obsolete and we
don't use it
2015-12-27 06:32:25 -08:00
KasparoVy
5f72fff880
Final Pass
...
Breaks Facial Hair updates into their own proc and puts facial hair on
its own layer.
Works through everything that calls update_hair with the intention of
updating facial hair and adds update_fhair
Fixes the sprite names and colouring on all 'facial' and 'body marking'
aspects.
Fixes/implements proper ID photo/preferences preview picture generation.
To do: Tail marking customization possible rework, gutting in the
meantime
2015-12-27 05:45:25 -05:00
Fox-McCloud
d1a5d443eb
more fixes
2015-12-27 00:52:56 -05:00
Mark van Alphen
13f2f92624
Merge pull request #2999 from Fox-McCloud/tesla-port-final
...
Ports TG's Tesla Engine
2015-12-25 16:21:11 +01:00
