cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 10:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,502 Commits 26 Branches 2 Tags
46bc0a93bcc4f2087f08dd53facab6ceb4c8a8a4
Commit Graph

143 Commits

Author SHA1 Message Date
Citinited
c31b0fcadf Merge branch 'master' into bad-karma 2017-06-10 19:16:13 +01:00
Citinited
cc7c4869b9 Actually fixes karma upon end-round shuttle 2017-06-10 18:59:45 +01:00
Fox McCloud
1a87a8a55b Merge pull request #7513 from Citinited/karma-fix 
Fixes the karma message popping up when you disconnected but had already spent karma
 2017-06-10 00:16:51 -04:00
Fox McCloud
b982080f16 Merge pull request #7258 from KasparoVy/cloning-crating-and-closeting 
Fixes Some RCS Issues
 2017-06-09 19:23:42 -04:00
Citinited
2b92d57b93 Fixes karma message popping up when you disconnected 2017-06-09 19:33:24 +01:00
KasparoVy
3834746136 Fixes #7243, RCS No Longer Teleports Crates/Closets to CC on Cargo Shuttle 2017-06-08 19:58:27 -04:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam
b7c87c041b Removes roundend karma reminder 2017-05-18 01:27:10 +01:00
Sam
039a2d07ac Revert "Adds a preference option" 
This reverts commit fd850a6e1e.
 2017-05-17 23:51:08 +01:00
Sam
fd850a6e1e Adds a preference option 2017-05-08 13:15:28 +01:00
Sam
27f5455a32 ...adds the message. 2017-05-07 19:58:58 +01:00
Sam
5b0f085b70 Adds karma reminder while shuttle in flight 2017-05-07 19:58:35 +01:00
Fox McCloud
0fff889f92 Merge pull request #6582 from Aurorablade/Ripple 
Don't Stand Under Shuttles
 2017-05-01 19:47:50 -04:00
Aurorablade
66e81c90d4 Fox tweaks 2017-05-01 18:54:34 -04:00
Aurorablade
b79269259b fox tweaks 2017-04-29 02:39:14 -04:00
davipatury
8963e96c41 effect/spider to structure/spider 2017-03-27 19:01:25 -03:00
davipatury
550fdd3ae3 effect/blob to structure/blob 2017-03-27 18:41:19 -03:00
uraniummeltdown
6d27ce0a62 added 10% chance for random crate to be added to supply shuttle on calling it to station 2017-03-18 11:19:31 +04:00
uraniummeltdown
d9dd77327a increased time, wirecutter is now a welder 2017-03-14 18:21:21 +04:00
uraniummeltdown
dedc33a23f decon time 15 -> 26 2017-03-12 17:57:30 +04:00
uraniummeltdown
85260a72ba plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines 2017-03-12 06:09:29 +04:00
Aurorablade
b16d609e59 Thanks jedr 2017-03-03 18:13:08 -05:00
Aurorablade
8248056b83 Revert "Sprite change" 
This reverts commit 003d588e85.
 2017-02-25 11:13:08 -05:00
Aurorablade
003d588e85 Sprite change 2017-02-25 02:18:45 -05:00
Aurorablade
c5bb917b66 Don'tStandUnderShuttles 2017-02-24 01:42:13 -05:00
davipatury
d4338bed12 Some changes! 2017-02-18 22:18:01 -02:00
davipatury
f1ae2e3f3a Shuttle Console nano-ui. 2017-02-18 20:49:38 -02:00
Mark van Alphen
dea264faf2 Merge branch 'master' into stationgoals 2017-02-17 18:05:15 +01:00
Krausus
4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Fox McCloud
69eae328d3 Merge pull request #6386 from uraniummeltdown/nukedeclaration 
Custom War Declaration
 2017-02-13 06:12:31 -05:00
uraniummeltdown
4cb4b6be82 better war dec checks, added custom war declarations from TG 2017-02-12 20:30:17 +04:00
Markolie
4d857de148 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals 
# Conflicts:
#	icons/effects/beam.dmi
 2017-02-11 18:26:06 +01:00
Markolie
c93a592102 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates 
# Conflicts:
#	code/modules/shuttle/supply.dm
 2017-02-10 18:19:53 +01:00
uraniummeltdown
60bb4fd5bc ported quantum pads from TG and added to RnD 2017-02-09 00:33:07 +04:00
Markolie
3298f7edce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates 
# Conflicts:
#	icons/obj/objects.dmi
 2017-02-08 19:25:47 +01:00
Fox McCloud
b35eb8e96f Merge pull request #6086 from tigercat2000/shuttle_hijack 
Hijacking a shuttle diverts it to the syndicate outpost
 2017-02-08 10:05:34 -05:00
Mark van Alphen
42cd3eec9a Merge branch 'master' into stationgoals 2017-02-07 18:51:08 +01:00
Markolie
7b755d2511 Add warp cube to supply shuttle blacklist 2017-02-06 21:07:22 +01:00
Markolie
1d6754728b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates 
# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
 2017-02-06 20:37:03 +01:00
Fox McCloud
800a54cc15 Merge pull request #6320 from Kyep/ert_shuttle_access 
Fixes ERT and SST shuttle accesses
 2017-02-06 10:08:33 -05:00
Markolie
b17dca7c57 Prevent signing own blood contract, prevent megafauna from healing on station, prevent hierophant teleports from going to Central Command 2017-02-05 20:36:04 +01:00
Markolie
f2497afd9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals 
# Conflicts:
#	_maps/map_files/cyberiad/z2.dmm
#	code/__DEFINES/is_helpers.dm
#	code/__DEFINES/misc.dm
#	code/_globalvars/lists/objects.dm
#	code/modules/mob/living/living_defines.dm
#	icons/effects/beam.dmi
 2017-02-05 20:12:51 +01:00
Tigercat2000
5e8c14789b Merge remote-tracking branch 'upstream/master' into shuttle_hijack2 2017-02-05 07:41:14 -08:00
Kyep
4e586e0db4 Fixes ERT and SST shuttle accesses 2017-02-02 17:47:21 -08:00
Fox-McCloud
6d4316264a plant analyzer QoL 2017-01-29 03:37:22 -05:00
Fox-McCloud
fd63808e6c supply shuttle re-addition 2017-01-28 12:56:20 -05:00
Markolie
a06c997629 Add Station Goals 
Still to-do:
* Remove old BSA computer.
* Add NanoUI interfaces for all goals.
* Test it.
 2017-01-23 22:02:29 +01:00
Fox-McCloud
7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud
10c0e734c3 more work 2017-01-22 01:46:48 -05:00
Crazy Lemon
2a209f62cd Merge pull request #5814 from Markolie/ann2 
Announcement refactor
 2017-01-18 19:17:30 -08:00