cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 13 Branches 2 Tags
dev-docs-readme
Commit Graph
7135 Commits
Author SHA1 Message Date
Fox McCloud b3524505b5 tweak 2018-05-14 17:51:13 -04:00
Fox McCloud f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
tigercat2000andGitHub 254cdd6055 Merge pull request #8972 from Fox-McCloud/power-cell 
Power Cell Code Cleanup
 2018-05-09 11:26:03 -07:00
Fox McCloud 8845262d65 Merge remote-tracking branch 'upstream/master' into holo-projector 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	paradise.dme
 2018-05-04 16:37:24 -04:00
tigercat2000 8071b42308 Merge remote-tracking branch 'upstream/master' into more_ss_ports 
# Conflicts:
#	code/modules/food_and_drinks/food/snacks.dm
 2018-05-03 19:30:41 -07:00
Fox McCloud 8bd042240f Power Cell Code Cleanup 2018-05-02 19:35:18 -04:00
Fox McCloud 70c3fb81a6 Buffs DIY Chainsaw 2018-05-02 18:05:39 -04:00
tigercat2000andGitHub 0c6cbbc5c3 Merge pull request #8959 from Fox-McCloud/remove-things 
Removes Programmable Unloaders and a Few Unused Files
 2018-05-01 14:07:12 -07:00
tigercat2000 7fb8f8d76c Merge remote-tracking branch 'upstream/master' into more_ss_ports 
# Conflicts:
#	paradise.dme
 2018-04-30 09:27:11 -07:00
Fox McCloud e649a72923 Emptying Stop-gap 2018-04-30 03:53:49 -04:00
Fox McCloud ee6a156ca2 Removes Programmable Unloaders and a Few Unused Files 2018-04-30 00:41:26 -04:00
Fox McCloud b394cf3624 Ports Holoprojectors 2018-04-30 00:24:46 -04:00
tigercat2000 7d8c9a731a SS Conversion: Atoms, Machines, n' Mobs 
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
 2018-04-28 17:55:15 -07:00
Fox McCloud cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
FalseIncarnate ba0b89c93c Refactoring and rewording 
Moves recipe list generation into its own proc and out of New()
- Makes lists only generate/update if not present, to save a small bit
of processing on the loop

Rewords the messages when adding items to mixing bowls and kitchen
machines to sound slightly better
> Also refactored messages which were split between multiple lines in
the code to be on one line and removed an extra space in one message
 2018-04-27 23:12:27 -04:00
FalseIncarnate b24b46dd21 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen 2018-04-27 22:47:29 -04:00
Kyep c3f271449e fixes merge conflicts with weapon removals 2018-04-26 00:09:18 -07:00
Kyep 08fdc2bce3 merge conflict fix 2018-04-25 23:48:44 -07:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000andGitHub 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
Fox McCloud 4243947e7a tweak 2018-04-25 21:48:44 -04:00
tigercat2000andGitHub 3bf0f18b52 Merge pull request #8916 from Tayyyyyyy/soap_qol 
Soap QOL
 2018-04-25 16:16:14 -07:00
FalseIncarnate 7b823195e5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen 2018-04-24 22:09:33 -04:00
tigercat2000andGitHub ad24d3a584 Merge pull request #8901 from Fox-McCloud/component-port 
Ports TG Components and R&D Tweaks
 2018-04-24 19:01:49 -07:00
tigercat2000andGitHub 5b68c2189c Merge pull request #8918 from Fox-McCloud/fluff-spawn-fix 
Fixes Random Plushie Spawning
 2018-04-24 18:09:11 -07:00
Fox McCloud 9860cf996e Fixes Random Plushie Spawning 2018-04-24 21:02:07 -04:00
Tayyyyyyy 8ecd9dd480 Fix coding style 2018-04-24 16:40:59 -05:00
Tayyyyyyy ef20a187c0 Reduce soap clicks 2018-04-24 16:28:22 -05:00
FalseIncarnate 3f1b2b4d6e Refactors stack handling 2018-04-23 21:43:13 -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
Aurorablade 34809e208a Fox twerks 2018-04-22 02:09:54 -04:00
Aurorablade 72a3c66cf5 IPC bleeding v2 2018-04-22 00:21:48 -04:00
Fox McCloud 32e3a25070 got it 2018-04-21 20:25:14 -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 25d331b0bb tweak 2018-04-19 21:14:00 -04:00
Fox McCloud 0f28456db3 Adds F.R.A.M.E. Cartridge 2018-04-19 20:54:59 -04:00
tigercat2000 2364b0332b Convert a bunch of name/(ckey) to key_name + ISO-8601 timestamps 2018-04-19 15:08:59 -08:00
tigercat2000 c03621c508 Completely Overhaul Logging 
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
 2018-04-19 15:07:59 -08:00
Fox McCloud 2b25584372 Merge remote-tracking branch 'upstream/master' into remove-weapons 2018-04-19 17:01:38 -04:00
MINIMAN10000 ad53317db1 Merge Conflict Resolved 2018-04-17 11:24:50 -07:00
tigercat2000andGitHub 17fd8e8a6a Merge pull request #8819 from Kyep/syndi_outfit_boots 
Improves admin outfits, fixes magboots, adds special antags
 2018-04-16 18:28:03 -07:00
tigercat2000andGitHub 66d4b79222 Merge pull request #8891 from MINIMAN10000/nobludgeon-remotes 
Adds nobludgeon to door remotes so they always work on doors
 2018-04-16 18:23:31 -07:00
tigercat2000andGitHub a9f4022fa8 Merge pull request #8874 from MINIMAN10000/cable-coil 
Cable coils can transfer part of a stack
 2018-04-16 18:12:14 -07:00
MINIMAN10000 2f873143ed Adds nobludgeon to door remotes making the remote always operate on the door 2018-04-16 17:56:35 -07:00
Fox McCloud b3fa91030b oops 2018-04-15 22:41:42 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
MINIMAN10000 f023edefa7 Crayons color cables, cableColor now cable_color 2018-04-14 23:54:37 -07:00
tigercat2000andGitHub 8b576c4d42 Merge pull request #8877 from Fox-McCloud/gc-stuff 
Adds more GC Debugging
 2018-04-14 21:28:54 -07:00
Fox McCloudandGitHub 6a02689398 Merge pull request #8726 from shazbot194/Major_Tom 
Major tom
 2018-04-14 23:58:19 -04:00