Commit Graph

4852 Commits

Author SHA1 Message Date
Ansari 5e24d3169a Add surplus crate purchase log 2018-05-23 16:54:32 +08:00
Ansari 535d9c9a4d Changed wording of borg spawner to be more consistent. 2018-05-23 14:03:40 +08:00
Ansari 964777f8e2 Port over Fox's refactored TG refund from TG. 2018-05-23 13:55:13 +08:00
Ansari 0c34abac39 Syndicate purchase are now logged to game_log 2018-05-22 12:42:08 +08:00
Ansari 2aa19ea8f8 Moves gloves of the north star to dangerous items 2018-05-21 16:54:05 +08:00
Fox McCloud 6cdfe70303 Converts and Updates Weather Subsystem 2018-05-21 00:01:18 -04:00
Fox McCloud c46cd7835b Datumizes Wishgranter 2018-05-20 15:48:29 -04:00
Fox McCloud f328db7b2a Refactors Camera Damage and Disabling 2018-05-20 05:45:07 -04:00
Crazy Lemon 25a3811ad3 Merge pull request #9028 from Fox-McCloud/gloves-of-death
Ports Gloves of the North Star
2018-05-18 20:20:01 -07:00
Fox McCloud 3b9e7b2834 description tweak 2018-05-18 00:57:11 -04:00
Aurorablade 69ab788689 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-05-18 00:19:32 -04:00
Fox McCloud 45858df458 Ports Gloves of the North Star 2018-05-17 17:20:28 -04:00
Fox McCloud 5df7dfdaac Preps the Way for Datumized Antags 2018-05-15 21:55:44 -04:00
Aurorablade c205f2662d Comments 2018-05-15 16:51:01 -04:00
Aurorablade 5d3ce2ac22 compiles
and removes shit we do not support yet.
2018-05-15 02:08:54 -04:00
Aurorablade 3c587ebad5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DatumAntag 2018-05-15 01:40:44 -04:00
Aurorablade ddb2305ddd updates to TG latest
hopefully addressing alot of fox commits..now i got to update the branch...
2018-05-15 01:40:15 -04:00
Crazy Lemon 3e4dbaf9c1 Merge pull request #9014 from Fox-McCloud/remove-dem-oldies
Removes A Bunch of Old, Unused Files
2018-05-14 17:55:12 -07:00
Fox McCloud 042ee7b77b comments 2018-05-14 20:40:39 -04:00
Fox McCloud f2bc448d02 comments 2018-05-14 20:09:51 -04:00
Fox McCloud ab780b3acf Removes A Bunch of Old, Unused Files 2018-05-14 06:40:48 -04:00
Fox McCloud f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
tigercat2000 c78075414c Merge pull request #8488 from Kyep/ds_tweaks
Tweaks Deathsquad
2018-05-04 19:03:54 -07:00
tigercat2000 662d7f34e2 Merge pull request #8949 from Kyep/tsf_marines
Solar Federation Outfit Fixes/Tweaks
2018-05-04 12:50:38 -07:00
Fox McCloud ee6a156ca2 Removes Programmable Unloaders and a Few Unused Files 2018-04-30 00:41:26 -04:00
Aurorablade 1468ea38d2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-04-29 22:52:12 -04:00
Fox McCloud 6ab3ec48ed change these timers 2018-04-29 21:15:42 -04:00
Fox McCloud 63e2a175fd Merge remote-tracking branch 'upstream/master' into timer-subsystem 2018-04-29 21:14:11 -04:00
tigercat2000 c70f238511 Merge pull request #8933 from Fox-McCloud/ports-looping-sounds
Ports Looping Sounds
2018-04-29 18:05:47 -07:00
Kyep 9f556d4ce6 pistols 2018-04-29 02:25:56 -07:00
Kyep da2122626a TSF marine update 2018-04-29 01:45:13 -07:00
Kyep e5ab0981f1 Small syndi officer fix 2018-04-29 00:04:12 -07:00
Fox McCloud 510c5b4268 fixes 2018-04-29 00:53:13 -04:00
Fox McCloud cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
FalseIncarnate b24b46dd21 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen 2018-04-27 22:47:29 -04:00
Aurorablade 820550d866 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-04-26 21:49:55 -04:00
Fox McCloud c93559c6ee nitpick 2018-04-26 21:23:44 -04:00
Fox McCloud cb423dfb1b Ports Looping Sounds 2018-04-26 19:18:24 -04:00
Aurorablade f2815bff7c Fixed plasmamen wizard 2018-04-26 03:58:50 -04:00
Kyep 682b9aaaf3 fixes merge conflict 2018-04-25 23:36:39 -07:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000 e086908c44 Merge pull request #8897 from Fox-McCloud/adds-frame
Adds F.R.A.M.E. Cartridge
2018-04-25 18:57:29 -07:00
FalseIncarnate 7b823195e5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen 2018-04-24 22:09:33 -04:00
Fox McCloud 7c8299d443 mint machine 2018-04-23 15:44:29 -04:00
Fox McCloud eafd57487c Merge remote-tracking branch 'upstream/master' into component-port
# Conflicts:
#	paradise.dme
2018-04-23 13:54:50 -04:00
Fox McCloud 32e3a25070 got it 2018-04-21 20:25:14 -04:00
Fox McCloud e82bc17904 makes it actually work 2018-04-21 06:34:46 -04:00
Fox McCloud 0382afcb33 Ports TG Components 2018-04-21 01:22:50 -04:00
FalseIncarnate 36dec344fa Merge conflict fix 2018-04-20 02:04:01 -04:00
Fox McCloud 0f28456db3 Adds F.R.A.M.E. Cartridge 2018-04-19 20:54:59 -04:00