cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 11:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,180 Commits 26 Branches 2 Tags
d0f1bc0a52929d080efe9a0ae372b4e2bc0ee860
Commit Graph

15184 Commits

Author SHA1 Message Date
Kyep
be1ae665dd Adds JMP link 2017-02-12 01:23:30 -08:00
Kyep
952c64b1f8 Improves singularity failure notice 2017-02-11 23:08:02 -08:00
Crazylemon64
6718d49af9 Fixes client varedit 2017-02-11 13:40:45 -08:00
uraniummeltdown
3df3688e72 move all crates to crates.dmi 2017-02-11 17:44:20 +04:00
Fox McCloud
04f5276047 Merge pull request #6350 from Markolie/lavaland_updates 
Add remaining Lavaland loot, kinetic accelerator refactor
 2017-02-11 00:02:42 -05:00
Markolie
c6559c7d9e Fix to_chat 2017-02-11 05:13:28 +01:00
Crazy Lemon
cef7f35ce3 Merge pull request #6161 from tigercat2000/goonlights 
Goonlights
 2017-02-10 19:21:20 -08:00
Crazy Lemon
17281506d2 Merge pull request #6123 from KasparoVy/vulp-cblind 
Vulpkanin & Tajara mod. Colour Vision, Darksight to Eyes, Internal Mech(assist) Organ Icons
 2017-02-10 18:27:58 -08:00
Crazy Lemon
69b70fbab8 Merge pull request #6374 from Fox-McCloud/drying-rack-fix 
Drying Rack Toggling Uses NanoUI and Other Fixes
 2017-02-10 18:09:27 -08:00
Crazy Lemon
c63d8008e2 Merge pull request #6233 from uraniummeltdown/events 
Tweaks Events
 2017-02-10 17:37:50 -08: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
CoreyLee Hassell
88f006432b Fixed reagents in destroying angels 
Had listed amantin twice in the reagent_add function for destroying angel. Combined to 0.3
 2017-02-10 11:14:04 -05:00
uraniummeltdown
a8aef39625 enabled slaughter demon event 2017-02-10 17:32:11 +04:00
Fox McCloud
795fda7874 Merge pull request #6366 from uraniummeltdown/quantumpads 
Quantum Pads
 2017-02-10 07:28:27 -05:00
Fox-McCloud
c34b0abfac Drying Rack Toggling Uses NanoUI and Other Fixes 2017-02-09 06:59:05 -05:00
uraniummeltdown
60bb4fd5bc ported quantum pads from TG and added to RnD 2017-02-09 00:33:07 +04:00
Markolie
924e539f22 Chassis mods now rename KA, remove cost from chassis mods/tracer mods 2017-02-08 19:27:16 +01: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
Markolie
7039ac7a6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-08 19:21:57 +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
Fox-McCloud
efb49ef18e Reagent Grinder Hotfix 2017-02-08 03:19:50 -05:00
Crazy Lemon
4f32d8f0f8 Merge pull request #6339 from Fox-McCloud/botany-reagents 
Botany reagents Tweak
 2017-02-07 20:03:08 -08:00
Crazy Lemon
2d77a0ab4d Merge pull request #6357 from Fox-McCloud/var-edit-fixes 
On Varedit Fixes
 2017-02-07 20:01:32 -08:00
Crazy Lemon
d11dfa7a3b Merge pull request #6343 from Fox-McCloud/reagent-tank-thingy 
Refactors Reagent Tanks--Adds High Capacity Water Tank
 2017-02-07 19:58:28 -08:00
Crazy Lemon
685250501b Merge pull request #6345 from Fox-McCloud/monkey-cube-refactor 
Monkey cube refactor
 2017-02-07 19:53:58 -08:00
Crazy Lemon
7b39b5ae58 Merge pull request #6358 from Fox-McCloud/all-mobs-hard-del 
Makes all Mobs Hard Delete
 2017-02-07 19:35:58 -08:00
Crazy Lemon
1f60fef9ea Merge pull request #6352 from Fox-McCloud/hydro-tray-nymph 
Fix Diona Nymph Crossing Trays--Refactors Diona Feeding
 2017-02-07 19:35:21 -08:00
Markolie
053ff0fbbb KA energy adjustments 2017-02-08 03:03:45 +01:00
Markolie
0790ed5f8d KA fixes, upgrade typo fix 2017-02-08 02:45:13 +01:00
Markolie
f1254dc7c7 Paradox bag/wisp fixes 2017-02-08 02:21:40 +01:00
Markolie
8ac7ea4dee Soul stone QoL update, paranormal hardsuit fixes 2017-02-08 01:27:00 +01:00
Markolie
835f68843a Minor fixes, prevent ABSTRACT items from being summoned 2017-02-07 23:54:50 +01:00
Crazy Lemon
7561459cb5 Merge pull request #6296 from KasparoVy/steal-storageimp-check 
Traitor Steal Objective now Checks Storage Implants
 2017-02-07 10:05:44 -08:00
Fox-McCloud
e60cc252c6 fix 2017-02-07 10:01:20 -05:00
Fox-McCloud
8ad196da0f Makes all Mobs Hard Delete 2017-02-07 09:42:49 -05:00
Fox McCloud
93df42e792 Merge pull request #6342 from uraniummeltdown/clingmemory 
Changeling Absorb Memory Fix
 2017-02-07 09:21:32 -05:00
Fox-McCloud
579e3bcbd4 forgot this one 2017-02-07 08:54:39 -05:00
Fox-McCloud
ad2468196e On Varedit Fixes 2017-02-07 08:44:50 -05:00
Fox-McCloud
15b4fc04a5 plasma in blumpkins 2017-02-07 07:01:58 -05:00
Fox-McCloud
7d72f348c3 Fix Diona Nymph Crossing Trays--Refactors Diona Feeding 2017-02-06 21:15:19 -05:00
Markolie
7b755d2511 Add warp cube to supply shuttle blacklist 2017-02-06 21:07:22 +01:00
Markolie
18688e6142 I can uncomment you now 2017-02-06 20:51:08 +01:00
Markolie
96bd88badb Fix action item message 2017-02-06 20:50:31 +01:00
Markolie
5deafdb4e5 Fix Destroy() return, replace set_dir with setDir 2017-02-06 20:44:12 +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
Markolie
7513c5d396 Camera on paranormal ERT hardsuit fix, eye of god message fix 2017-02-06 20:31:31 +01:00
Markolie
8e4439c7f1 Add immortality talisman, add final items 2017-02-06 20:08:52 +01:00
Markolie
7a4c33bbcd Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions 2017-02-06 19:55:37 +01:00
Markolie
7bdc9a4ca7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-06 18:54:04 +01:00
Markolie
2a23862c6a Kinetic accelerator update, other fixes 2017-02-06 18:39:03 +01:00