Fox-McCloud
|
ebdd9d3897
|
Timestop Spell Port and Sepia Slimes
|
2016-01-06 03:30:08 -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 |
|
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 |
|
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 |
|
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
|
a1a0daaf2e
|
Merge pull request #3096 from Fox-McCloud/fast-transfer
Fixes Fast Crew Transfers
|
2016-01-03 20:03:37 -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 |
|
Fox McCloud
|
5f43d9e93f
|
Merge pull request #3088 from tigercat2000/code_styling_nazi
January Cleaning
|
2016-01-03 19:42:09 -05:00 |
|
Certh
|
fcc2ce7032
|
This fixes errors with the air alarm monitoring
|
2016-01-03 23:54:47 +01: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
|
34e047267d
|
Fast Crew Transfers
|
2016-01-03 09:11:06 -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
|
a8e4d63925
|
Merge pull request #3079 from tigercat2000/styling
NanoUI Improvements Part 2: ELL EEE ESS ESS
|
2016-01-02 23:13:35 -05:00 |
|
Tigercat2000
|
b606a6d1fd
|
Clean incorrect styling for the ++ operator
|
2016-01-02 10:46:01 -08:00 |
|
TheDZD
|
ac8a3ba061
|
Merge pull request #3068 from Fox-McCloud/shocking
Electrocution Refactor+Electric Reagents
|
2016-01-01 18:55:36 -05:00 |
|
Fox McCloud
|
fb6f3e05d5
|
Merge pull request #3060 from RudiPardieck/materials
Material usage fixes
|
2016-01-01 17:34:44 -05:00 |
|
Fox McCloud
|
e27d585889
|
Merge pull request #3072 from Aurorablade/Flyswatter
bug fixes
|
2016-01-01 17:33:19 -05:00 |
|
Tigercat2000
|
0971ef903b
|
NanoUI Improvements Part 2: SEE ESS ESS
|
2016-01-01 12:51:08 -08:00 |
|
Aurorablade
|
ce7f05334d
|
Bug fixes
|
2016-01-01 01:26:44 -05:00 |
|
TheDZD
|
7fb32aca37
|
Merge pull request #3056 from Fox-McCloud/nuke-challenge
Nuclear Challenge Mode
|
2015-12-31 22:40:19 -05:00 |
|
Fox-McCloud
|
e38417cebe
|
Electrocution Refactor+Electric Reagents
|
2015-12-31 17:28:27 -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 |
|
Fox-McCloud
|
c3d5311c32
|
no meta-gaming
|
2015-12-31 00:44:21 -05: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 |
|
TheDZD
|
032a5dfe9e
|
Merge pull request #3047 from Fox-McCloud/reagent-tweaks
A few Overdose Reagent Tweaks
|
2015-12-30 13:49:30 -05:00 |
|
Fox-McCloud
|
ce2eb1c0ad
|
Nuclear Challenge Mode
|
2015-12-30 03:03:06 -05:00 |
|