cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-03 20:43:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
33,609 Commits 11 Branches 2 Tags
e291a7ec6f48833f91bfb99fc3586d3f5eabe9ce
Commit Graph

1241 Commits

Author SHA1 Message Date
Sam e291a7ec6f Fixes 7082 2017-04-10 01:10:20 +01:00
Crazy Lemon f9ee33a797 Merge pull request #7054 from Fox-McCloud/destroy-qdelnull 
Converts Most Destroys to use QDEL_NULL
 2017-04-05 23:49:19 -07:00
Fox-McCloud 5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Sam 88ec05be4e Couple typos and a gramatically tweak 2017-04-04 14:27:22 +01:00
Crazy Lemon c6abe7822b Merge pull request #6961 from Fox-McCloud/garbage-collect-stuffs 
Garbage Collection and Code Cleanup
 2017-04-01 22:58:52 -07:00
Fox McCloud f83b48f26a Merge pull request #6997 from Crazylemon64/ghostbeacon_rerouting 
Allows rerouting of ghost beacons
 2017-04-01 17:46:22 -04:00
Fox McCloud 7668c79e7c Merge pull request #7006 from KasparoVy/windowner 
Window Corridor Thrown Objects Fix
 2017-04-01 17:39:28 -04:00
KasparoVy 3aa4cefad8 Window Corridor Thrown Objects Fix 
Thrown objects that cross a tile with non-full windows will no longer hit the window even if it isn't visually obstructing the path.
 2017-03-31 04:50:56 -04:00
Fox McCloud f821749086 Merge pull request #6777 from uraniummeltdown/tesla 
Tesla Grilles
 2017-03-30 21:24:21 -04:00
Crazylemon64 2165d5db6f Allows rerouting of ghost beacons 2017-03-30 03:16:06 -07:00
Fox-McCloud 50051ee851 Garbage Collection and Code Cleanup 2017-03-27 18:37:44 -04:00
Sam 54de887b6c Removing superfluous override 2017-03-27 09:14:24 +01:00
Sam 8bdd31c4c2 Latest batch of fixes - bad ❄️ 2017-03-27 09:01:36 +01:00
Sam 8965ba9872 Misc grammatical fixes 
Adds message to let people know when you're trying to yank out objects
from them
 2017-03-27 06:16:24 +01:00
Sam 7dc3b9388b Resolves Fox's concerns (Hopefully) 2017-03-27 04:10:57 +01:00
Sam 0b7a95933c Refactors bed/chair/stool deconstruction + more 
Add psych bed... fixes typos... fixes inconsistent deconstruction
amounts
 2017-03-26 15:50:49 +01:00
Sam fbd7edd7f3 Comment following discussion 2017-03-26 06:59:50 +01:00
Sam 4987aac15c Wooden chairs break into wood not metal 2017-03-25 02:29:58 +00:00
Fox McCloud 2844a024ab Merge pull request #6853 from KasparoVy/stuff 
Fixes #6842, #6840 and #6839
 2017-03-22 17:17:32 -04:00
KasparoVy 1cbe9d0bb6 Beds now return 2 metal when deconstructed. 
Removes unnecessary src.
 2017-03-21 16:45:55 -04:00
Fox McCloud 9444666c18 Merge pull request #6818 from KasparoVy/deadlier-nuke 
Nuke kills everybody (On the station Z-level).
 2017-03-21 15:08:54 -04:00
Fox McCloud 472bd7b887 Merge pull request #6813 from SamHPurp/fixes-vent-text 
Fixes
 2017-03-20 16:39:10 -04:00
Sam e43cb810a8 More bits wew. 2017-03-20 06:37:56 +00:00
KasparoVy 1c556648c6 Keeping up with the Jones. 
Nukeproof fridges.
 2017-03-19 05:49:07 -04:00
Sam 3b166bcb97 Fixes formatting issue ( Thanks @Tigercat2000 ) 2017-03-19 04:29:18 +00:00
Sam 4f4e749b83 Fixes infinite production of cable coil 2017-03-19 04:25:41 +00:00
Sam d5d3fdfc84 Fixes typos, and changes a name to bring it inline with the rest of the assemblies 2017-03-19 03:54:45 +00:00
uraniummeltdown cd6b6a61d7 added dog beds craftable from 10 wood planks 2017-03-17 17:46:04 +04:00
uraniummeltdown dbdf42d3e3 grilles have 50% chance to tesla_zap when objects thrown at it 2017-03-15 17:28:07 +04:00
uraniummeltdown 0fc0aac229 remove target argument from ex_act() 2017-03-14 15:20:33 +04:00
uraniummeltdown 70c2a27d16 Merge branch 'master' into grilles 2017-03-12 16:52:13 +04:00
uraniummeltdown 2af6b1de23 grille code updates from tg, removed attack_self() from rods they now use recipes, refactored grille (de)construction, added broken grille object for mapping, grilles can be damaged by throwing objs or mobs at them, also general code cleanup 2017-03-12 16:35:24 +04:00
Markolie 5c20a29b1d Fix statue welding, fix firedoor message spam, fix slaughter candidate pick 2017-03-11 18:25:23 +01:00
uraniummeltdown 9eb7eea1e9 removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA 2017-03-10 22:46:02 +04:00
Markolie a6a7cf9d36 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	code/game/jobs/job/job.dm
 2017-03-10 12:42:37 +01:00
Fox McCloud 9510fa9f6c Merge pull request #6711 from Crazylemon64/playercreation_assembly_line 
Streamlines the ghost-to-player creation process
 2017-03-09 21:30:22 -05:00
Mark van Alphen 93470e3570 Merge branch 'master' into zefix 2017-03-09 17:20:31 +01:00
Crazylemon64 38dc304e54 Adds nitpick and allows for transformer rotation 
No actual sprites for the latter, so it's kind of doofy, but oops
 2017-03-08 19:04:19 -08:00
Crazylemon64 869c9b76c4 Streamlines the ghost-to-player creation process 
Also refactors ERT equipment to be actual outfits instead of hardcoded
 2017-03-08 05:49:49 -08:00
Markolie acab5d5170 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz 
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm
 2017-03-08 10:45:16 +01:00
Fox McCloud f96c335d1f Merge pull request #6704 from uraniummeltdown/hardsuit 
Rename all "rigs" (hardsuits) to hardsuits
 2017-03-07 23:35:07 -05:00
uraniummeltdown dc6f9f5506 rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands 2017-03-07 20:55:43 +04:00
Markolie 3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Markolie ceb14ef15d Fix NODROP interaction with secure closets 2017-03-06 13:34:05 +01:00
Fox-McCloud 41d4c83f17 Refactors Money 2017-03-06 04:52:03 -05:00
Markolie 02c4cd26f4 Final fixes 2017-03-05 16:42:14 +01:00
Markolie b787b8f8e4 Refactor mineral door code 2017-03-05 15:02:17 +01:00
Markolie e6b39c3185 Fixes 2017-03-05 14:31:26 +01:00
Crazy Lemon 5e1bd050f8 Merge branch 'master' into adminin 2017-03-03 23:23:40 -08:00
davipatury d78d800d8a Tank dispenser nano-ui. 2017-02-27 19:14:20 -03:00