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
Aurorablade
bd19dc6942
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-01 22:38:23 -05: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
Aurorablade
92e15c1b2a
BREAK ALL THE THINGS
2015-12-31 01:23:44 -05: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
Fox-McCloud
d14aac6f7b
nicotine patches
2015-12-30 00:07:37 -05:00
TheDZD
444c635e7f
Merge pull request #3045 from FalseIncarnate/master
...
Heater / Freezer QOL Tweak
2015-12-29 13:37:39 -05:00
Crazylemon
e576b3a777
Fixes Fox's points
2015-12-29 10:18:56 -08:00
Regen
7a51db1f2f
keep the !!FUN!!, remove !!ACCIDENT!!
2015-12-29 17:58:19 +01:00
KasparoVy
8d1eeb58da
Cloning Support for Markings & Head Accessories
2015-12-29 07:50:06 -05: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
FalseIncarnate
b7848e3ed3
Heater / Freezer QOL Tweak
...
Atmospherics Heaters and Freezers now let the player select the
direction for the connector from a list of the cardinal directions.
- Previously randomly picked a direction, leading to a lot of wasted
time if RNG was angry with you.
2015-12-28 11:23:21 -05:00
Fox-McCloud
0f03947d55
Ports Elite Syndicate Hardsuit and Uplink Refactor
2015-12-28 08:37:27 -05:00
Crazylemon64
c4cb53bf0a
To heck with it here we go looks good enough
...
Also
- Increases the number of memes in the codebase
2015-12-28 01:12:13 -08:00
TheDZD
3e4ba3a857
Merge pull request #3035 from Fox-McCloud/box-fix
...
Cardboard Box Fix
2015-12-27 22:07:04 -05:00
Fox McCloud
2b3e18ce23
Merge pull request #3030 from RudiPardieck/BodyScannerNano
...
Bodyscanner ui
2015-12-27 20:32:42 -05:00
Tigercat2000
9cb84e83ca
Clean old shit, delete old files, move files, mrowl
2015-12-27 15:58:41 -08:00
KasparoVy
8bbd18846d
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2015-12-27 18:44:45 -05: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
TheDZD
ec9d4aa8b0
Merge pull request #3019 from monster860/longerntsl
...
Changed TComms Traffic Control to use POST for NTSL code
2015-12-27 17:55:28 -05:00
Fox McCloud
4933717afd
Merge pull request #3014 from Robertha89/patch-3
...
Fixes Battle Arcade Rupturing Eardrums
2015-12-27 17:35:22 -05:00
Robertha89
258d8278b5
Fixes mistake
2015-12-27 22:39:57 +01:00
