cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-19 22:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,410 Commits 27 Branches 2 Tags
0f28456db3e07197cdca4b2a16234edeec54d8d7
Commit Graph

17242 Commits

Author SHA1 Message Date
Fox McCloud
0f28456db3 Adds F.R.A.M.E. Cartridge 2018-04-19 20:54:59 -04: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
tigercat2000
b9921501d8 Merge pull request #8879 from Citinited/parent-proc-fix 
Kitchen machinery now calls ..() in New()
 2018-04-16 18:25:35 -07:00
tigercat2000
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
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
tigercat2000
8b576c4d42 Merge pull request #8877 from Fox-McCloud/gc-stuff 
Adds more GC Debugging
 2018-04-14 21:28:54 -07:00
Fox McCloud
6a02689398 Merge pull request #8726 from shazbot194/Major_Tom 
Major tom
 2018-04-14 23:58:19 -04:00
shazbot194
1747f9e31e Small code improvements and description reverts 2018-04-14 17:25:56 -08:00
Fox McCloud
129e1f66f7 GC radio stuffs 2018-04-14 13:44:26 -04:00
Citinited
0d71bf4388 obj/machinery/kitchen_machine/New now calls ..() 2018-04-14 11:21:54 +01:00
Fox McCloud
c3bfb42f3a Merge pull request #8847 from tigercat2000/nightshift_tweak 
Make sec levels avoid overwriting an admin-forced nightshift
 2018-04-13 21:32:14 -04:00
tigercat2000
148798e06f Merge pull request #8868 from Fox-McCloud/fox-fluff 
Fox Fluff Item
 2018-04-13 18:31:50 -07:00
MINIMAN10000
5d52f60d9d Comment about where merging is handled, moved to_transfer variable to immediately above where it is used 2018-04-13 18:27:20 -07:00
MINIMAN10000
e875af3d56 Cable Coils can partial transfer, stripped depereciated code, changed cable coil message 2018-04-13 16:48:14 -07:00
tigercat2000
bee011cb05 Merge pull request #8789 from MarsM0nd/manned_up 
Man up changes
 2018-04-13 15:43:14 -07:00
Mars
fe7991da68 Revert man up message change 2018-04-13 13:27:26 +02:00
Fox McCloud
8c5992f1e6 Fox Fluff Item 2018-04-12 17:23:09 -04:00
KasparoVy
cf351543ce Removes Job Restriction from Purely Cosmetic and Rarely Used Veils 
Roboticist wasn't even spelled correctly. No idea if there were any other typos.
 2018-04-09 03:00:27 -04:00
Fox McCloud
b659a1d9a1 Merge pull request #8678 from Kyep/ts_tunneler 
Terror Spider Update, Brown Terrors
 2018-04-08 01:38:34 -04:00
Fox McCloud
196d0b90f9 Makes Records GC (most of the time) 2018-04-07 23:38:10 -04:00
Kyep
4f3fa5c11c Tiger requests 2018-04-07 13:50:23 -07:00
tigercat2000
f60fbf9cef Merge pull request #8573 from uraniummeltdown/drone 
Makes Drones A Small Mob
 2018-04-06 21:21:50 -07:00
tigercat2000
6743a6136c Merge pull request #8777 from MarsM0nd/admin_fax 
Fax machine changes
 2018-04-06 20:33:07 -07:00
tigercat2000
a1c2da04fe Merge pull request #8705 from Birdtalon/ether 
Re balances ether into a better anaesthetic
 2018-04-06 20:21:04 -07:00
tigercat2000
367ed46b79 Merge pull request #8618 from Kyep/xeno_window 
Deletes Xenobio SIT docking port
 2018-04-06 20:13:37 -07:00
tigercat2000
86f89382c4 Merge pull request #8834 from Crazylemon64/hotelsec_lootnerf 
Nerfs loot-pinata-ing of hotel guards
 2018-04-06 20:07:30 -07:00
tigercat2000
57a4be2138 Merge pull request #8794 from Birdtalon/fixes 
Fixes and tweaks
 2018-04-06 20:02:07 -07:00
tigercat2000
413832ee27 Merge pull request #8837 from Kyep/better_demotions 
Better ID computer logging
 2018-04-06 20:01:38 -07:00
Fox McCloud
af7abe2679 Makes Stacks Garbage Collect 2018-04-06 19:32:08 -04:00
tigercat2000
639c40d140 Merge pull request #8824 from Fox-McCloud/gc-ss-port 
Ports TG's Garbage Subsystem
 2018-04-05 20:49:04 -07:00
Fox McCloud
9901fa4154 tweaks 2018-04-05 23:36:34 -04:00
Fox McCloud
f7521320a0 fixes the runtimes 2018-04-04 19:14:22 -04:00
shazbot194
234c8a78bc Merge conflict fix 2018-04-04 12:18:07 -08:00
tigercat2000
77519c926f Make sec levels avoid overwriting an admin-forced nightshift 2018-04-04 09:26:14 -07:00
Ty-Omaha
e5ded5dba9 fixes typo 2018-04-04 11:11:27 -04:00
Fox McCloud
29a59cc06d modular computer/software destroy fix 2018-04-04 07:04:23 -04:00
Fox McCloud
1d80bf01c0 Merge remote-tracking branch 'upstream/master' into gc-ss-port 
# Conflicts:
#	paradise.dme
 2018-04-03 18:21:04 -04:00
Fox McCloud
b61766fbc5 Merge pull request #8812 from tigercat2000/night_shift 
Nightshifts & Randomized Station Time
 2018-04-03 18:09:09 -04:00
Kyep
051e7755d8 darn modular computers 2018-04-03 01:27:22 -07:00
tigercat2000
8fae4e380f Merge pull request #8840 from Fox-McCloud/spacevine-fix 
Fixes Unkillable Spacevines
 2018-04-02 21:16:29 -07:00
Fox McCloud
c22025abfa Fixes Unkillable Spacevines 2018-04-03 00:08:56 -04:00
tigercat2000
8e5a42a7a1 Merge remote-tracking branch 'upstream/master' into night_shift 
# Conflicts:
#	code/world.dm
 2018-04-02 17:24:36 -07:00
Crazy Lemon
d07ef9a1ec Merge pull request #8793 from DesolateG/Cricketborg 
Adds Cricket Borgs to appearance selection for Cyborgs.
 2018-04-01 23:46:03 -07:00
Crazylemon64
002684fa5d Hotel space guards now fight back more meaningfully 
and now dust on death to prevent loot pinata-ing
 2018-04-01 22:26:32 -07:00
Kyep
322dc17154 deletes from shuttle controller, squash 2018-04-01 21:59:12 -07:00
Crazy Lemon
43671698cd Merge pull request #8490 from Kyep/pet_tweaks 
Station Pet Tweaks
 2018-04-01 21:53:51 -07:00
Kyep
39e0612683 deletes pushing changes 2018-04-01 21:43:24 -07:00