cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 14:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,147 Commits 26 Branches 2 Tags
092773132dea4090bf087ca4e4e6fe604cae4ca9
Commit Graph

5041 Commits

Author SHA1 Message Date
Mark van Alphen
c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
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
0bc6859d7e Merge pull request #11305 from Fox-McCloud/its-time 
It's Time
 2019-04-16 19:48:20 +08:00
variableundefined
546bd0edf5 Merge pull request #11288 from Fox-McCloud/toxins-remap 
Remaps Toxins
 2019-04-16 19:47:14 +08:00
Fox McCloud
7f00f8313a It's Time 2019-04-14 18:24:48 -04: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
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update 
The Nations Update Everyone Deserves!
 2019-04-09 20:47:34 -07: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
Fox McCloud
8cf68e7cae Fixes Russian Revolver 2019-04-07 07:37:02 -04:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04: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
CornMyCob
7eb4277a01 MORE UPDATES! 2019-04-03 20:29:16 +01:00
TDSSS
2ba5ec0228 fake revolver kit creation 2019-04-03 20:43:55 +02:00
AzuleUtama
3bbfcc8755 Cleans up some uplink code for showing descriptions 2019-04-02 20:36:52 +01:00
CornMyCob
9f5b3fc796 updates 2019-04-02 20:26:23 +01:00
variableundefined
a552137e07 Merge pull request #11190 from Fox-McCloud/flash-sonic-bang 
Flash Powder, Sonic Powder, and Flashbang Refactor
 2019-04-02 20:33:17 +08: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
Mark van Alphen
45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
 2019-03-30 22:55:09 +01:00
Mark van Alphen
f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
Fox McCloud
f70ecb4387 Adds Trick Revolver 2019-03-29 23:33:46 -04:00
Mark van Alphen
fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01: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
Fox McCloud
46fdd6c466 Fixese Flares not Returning a qdel hint 2019-03-24 19:57:34 -04: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
ec46fdc510 Merge pull request #11090 from Tails2091/Animal_Sounds 
Added Emotes and Sounds to Corgis and Cats. Moved Animal Sounds to Creature Folder.
 2019-03-24 17:55:01 +08: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