cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-23 06:13:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,145 Commits 10 Branches 2 Tags
5452d4e8df05abd2e19b8fc8474cf0a1bf345729
Commit Graph

3318 Commits

Author SHA1 Message Date
Mark van Alphen 09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
 2019-04-18 03:15:52 +02:00
variableundefined 31a2779bae Merge pull request #11259 from Markolie/flukeops 
Nuke Ops updates and buffs
 2019-04-18 07:16:31 +08:00
Mark van Alphen 6faf9c769f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
 2019-04-17 22:46:43 +02:00
variableundefined 546bd0edf5 Merge pull request #11288 from Fox-McCloud/toxins-remap 
Remaps Toxins
 2019-04-16 19:47:14 +08:00
Mark van Alphen a9fa2f32e1 Remove infinite claw sharpening 2019-04-15 00:01:08 +02:00
Fox McCloud 93118f9d34 Remaps Toxins 2019-04-11 07:24:16 -04:00
Mark van Alphen c597c9be51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/turfs/simulated/floor/plating.dm
#	code/modules/clothing/suits/jobs.dm
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
 2019-04-11 07:27:51 +02:00
Mark van Alphen 69aa881c39 Flashbang fix 2019-04-11 05:32:54 +02:00
Mark van Alphen f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
 2019-04-10 21:54:54 +02:00
Fox McCloud 03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc 
# Conflicts:
#	code/game/objects/items.dm
 2019-04-07 19:54:14 -04:00
Mark van Alphen f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
variableundefined 7416eebf7f Merge pull request #11265 from Fox-McCloud/fix-pill-bottles 
Fixess Being Unable to Open Pill Bottles
 2019-04-07 22:12:01 +08:00
Fox McCloud c0ca397d8a Fixess Being Unable to Open Pill Bottles 2019-04-07 09:25:45 -04:00
variableundefined 53d64d818d Merge pull request #11225 from TDSSS/box-revolver 
Trick revolver comes in a box.
 2019-04-07 21:14:51 +08:00
Mark van Alphen 391d91132c Fix code review issues (planetary_atmos and Initialize()) 2019-04-04 23:23:30 +02:00
Mark van Alphen a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
CornMyCob e02087d474 blood drunk miner 2019-04-04 20:34:26 +01:00
variableundefined cc831667cd Merge pull request #11081 from Kyep/hijack_limits 
Syndie Uplink changes (better interface, hijack-only firegrenades)
 2019-04-04 09:30:56 +08:00
TDSSS 2ba5ec0228 fake revolver kit creation 2019-04-03 20:43:55 +02:00
CornMyCob 9f5b3fc796 updates 2019-04-02 20:26:23 +01:00
Mark van Alphen 3f6f4555d7 Minor Lavaland item fixes 2019-04-01 23:51:41 +02:00
Mark van Alphen f75de97c6e Port over Corn and affected's work on Lavaland 
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
 2019-04-01 23:41:32 +02:00
Mark van Alphen 935449fb39 Remove duplicate suit, other minor fixes 2019-04-01 03:51:42 +02:00
Mark van Alphen ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Mark van Alphen 1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02:00
Mark van Alphen 1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Fox McCloud cbcc4aab45 Flash Powder, Sonic Powder, and Flashbang Refactor 2019-03-31 03:29:27 -04:00
variableundefined e6ef2e9bbc Merge pull request #11151 from Fox-McCloud/suicide-refactor 
Suicide Refactor
 2019-03-29 20:49:18 +08:00
variableundefined 0822830491 Merge pull request #11131 from farie82/handcuff-1-hand 
You can cuff people with atleast one hand now + refactor of handcuff code
 2019-03-29 19:23:37 +08:00
Fox McCloud d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Fox McCloud a8dc5770db whoops 2019-03-27 23:09:21 -04:00
Fox McCloud 814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
joep van der velden cc8e076ae5 alternative. 1 handed cuffing 2019-03-25 20:19:42 +01:00
joep van der velden 51feae1354 fixed the borg handcuffing being inconsistent and did some refactoring 2019-03-24 22:28:07 +01:00
variableundefined 85ab7a8b06 Merge pull request #11065 from Fox-McCloud/pill-bottles-and-patch-packs 
[Goonchem] Pills, Bottles, Patches, and Pillbottles
 2019-03-24 17:51:00 +08:00
variableundefined 4ca33bb19d Merge pull request #11078 from Fox-McCloud/goonchem-reagent-temperature 
[Goonchem] Reagent Temperature and Pyrotechnics
 2019-03-24 17:50:07 +08:00
variableundefined a34c8dda8f Merge pull request #11076 from AzuleUtama/syndieMedBagChanges 
Removes MMI from uplink surgery kit - makes it a separate purchase for Roboticists
 2019-03-24 17:47:02 +08:00
variableundefined 64c0cf7a0b Merge pull request #11074 from farie82/refactor-pickup-and-fix-bomb 
Refactored pickup code and fixed the bomb guardian bug
 2019-03-23 20:04:15 +08:00
variableundefined 7950a53d37 Merge pull request #11049 from Tails2091/lockbox-fix 
Lockbox now kicks user out upon locking #11046
 2019-03-23 19:59:05 +08:00
Fox McCloud 585dcb4355 sprite 2019-03-22 23:25:45 -04:00
Fox McCloud 6caec96c2a fixed 2019-03-20 01:56:46 -04:00
Kyep 3559a77d0f Uplink improvements 2019-03-19 04:35:03 -07:00
Fox McCloud cc1b49eed6 fix 2019-03-18 23:19:13 -04:00
Fox McCloud 277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
AzuleUtama 29aa1ccef7 Removed MMI from surgery bag, made it Roboticist only 2019-03-18 20:22:38 +00:00
joep van der velden e83a7131cc Refactored pickup code and fixed the bug 2019-03-18 16:42:44 +01:00
Fox McCloud d61bbe807d [Goonchem] Pills, Bottles, Patches, and Pillbottles 2019-03-17 21:30:10 -04:00
Tails2091 8865cbeb83 3 is now 2 and 4 is now 3 
My bad.
 2019-03-17 17:01:54 -04:00
Tails2091 e4b9988b85 Lockbox now kicks user out upon locking 2019-03-15 12:53:00 -04:00
Couls 2f23d50740 Make text blue 2019-03-11 21:44:32 -04:00