cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-05 13:33:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
33,085 Commits 15 Branches 2 Tags
a99b4ece15beda810321d3c8d8fb498c673bc3cd
Commit Graph

1212 Commits

Author SHA1 Message Date
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
uraniummeltdown d0d2c63f30 remove trailing returns, alter checks, setdir, light_range 2017-02-27 15:03:28 +04:00
uraniummeltdown 0c7ec9d330 Merge remote-tracking branch 'remotes/upstream/master' into statues 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-27 14:27:24 +04:00
Fox McCloud fbed82b080 Merge pull request #6570 from SamHPurp/no-ghost-spin 
Refactors the Chair Rotate verb
 2017-02-25 06:51:57 -05:00
Sam 83e616d8d8 Removes a superfluous return 
Hopefully the final change..
 2017-02-25 09:08:41 +00:00
Sam e1abe58da7 Fixes indentation 2017-02-24 20:09:17 +00:00
Sam 79d5d7dc0c Removes an unnecessary 'else' statement 
Tidies the code up a bit more
 2017-02-24 20:05:59 +00:00
Sam d376c1a5da Now uses setDir 
Tested, and didn't break anything.
 2017-02-22 23:38:43 +00:00
Sam cde421e0eb Refactoring of the Rotate verb 
removes a few unnecessary checks. Still not using setDir yet, as I have
yet to work out how it works. To come!
 2017-02-22 23:07:18 +00:00
Sam 5bc8c45e82 Stops ghosts from interacting with chairs 
Removes the ability for ghosts to spin chairs.
 2017-02-22 13:41:29 +00:00
Markolie 481083dfca Variable fix 2017-02-21 13:49:00 +01:00
Markolie a23493af86 Remove as obj 2017-02-21 13:43:37 +01:00
Markolie 389890bb2d Additional admin interaction additions 2017-02-21 13:26:18 +01:00
Sam d3e3ed24a4 Dethrones captain, adds crown to hat crate 
Removes crown from Captain locker & adds to collectible hat crate
 2017-02-20 12:53:12 +00:00
uraniummeltdown 4c6472aa49 rotation for mime statue 2017-02-19 22:39:23 +04:00
uraniummeltdown 7628586ee6 adds mineral statues from TG, added statue recipes for minerals, breakdown sandstone->sand 2017-02-19 21:48:13 +04:00
Mark van Alphen f42b9cf383 Merge branch 'master' into admin_interact 2017-02-18 15:41:16 +01:00
Krausus 4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Crazy Lemon e89bbcd9c1 Merge pull request #6330 from FlimFlamm/box_sprite_addition 
Large Cardboard Box Decals/Sprites
 2017-02-14 23:12:41 -08:00
Markolie f701813f6e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact 
# Conflicts:
#	code/modules/client/client defines.dm
 2017-02-12 00:03:49 +01:00
Markolie 900653ea0e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-11 20:31:23 +01:00
uraniummeltdown 3df3688e72 move all crates to crates.dmi 2017-02-11 17:44:20 +04:00
Crazy Lemon cef7f35ce3 Merge pull request #6161 from tigercat2000/goonlights 
Goonlights
 2017-02-10 19:21:20 -08:00
Markolie dec9bc71ac Fix music import runtime 2017-02-10 18:59:58 +01:00
Markolie a4422a41ee Re-add anchored check 2017-02-10 18:57:57 +01:00
Markolie b0d4f5d92a Various fixes 2017-02-10 18:55:23 +01:00
Markolie 0117892f54 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact 
# Conflicts:
#	code/game/machinery/doors/firedoor.dm
 2017-02-10 18:18:29 +01:00
Markolie 2afd77a54a Split admin interaction into regular and advanced, make more devices ghost-interactable 2017-02-09 19:30:36 +01:00
FlimFlamm ebed2adc55 This commit updates the name of the new "cardboard_boxes.dmi" file (from boxes.dmi) to prevent future confusion with regular boxes. 2017-02-09 02:08:41 -04:00
Markolie 4a155bfb50 Admin interaction update 2017-02-08 23:27:08 +01:00