cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-17 00:57:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,947 Commits 17 Branches 2 Tags
9de53dfd1c9e29c8a437501046ec7a9ec22fadaa
Commit Graph
435 Commits
Author SHA1 Message Date
Fox McCloudandGitHub f205f5f040 Merge pull request #5915 from Twinmold93/runtime_fixer_t2 
Spacepod and Some Runtime Fixes
 2016-12-01 10:15:51 -05:00
Twinmold ada80ec529 Pod Fixes and Some Runtime Fixes 
Fixes sending pod pilots to the void when the pod explodes/is destroyed,
as well as giving them damage warnings, just like passengers get. Also
fixes it so if a guardian traps something, then dies, doesn't runtime.
Lastly, fixes it so there isn't a randomly runtime from opening a
critter crate, as well as cleaning up a little snowflake code, thanks to
Crazylemon.
 2016-11-26 05:37:31 -06:00
TullyBurnalot 1955f86383 Fax Guide Removal 
- Removes Fax Guides from HoS and HoP Lockers
 2016-11-12 01:59:21 +00:00
uraniummeltdown aac3fa245d added absolute paths 2016-09-03 09:15:30 +04:00
uraniummeltdown 92fc9d79f4 removed access requirements 2016-09-02 08:24:21 +04:00
uraniummeltdown 7eac0d4d8a added mime and clown lockers to code, added sprites 2016-09-01 21:43:49 +04:00
Crazylemon64 05ebb18b3d Fixes a closet runtime 2016-08-22 22:14:31 -07:00
Isaac Erwin 8b9b28a3c5 Fixes welded fireclosets not showing up properly 2016-08-13 13:14:30 -04:00
TheDZDandGitHub 6d280e52de Merge pull request #5375 from Fox-McCloud/formal-captain 
Formal Captain Update
 2016-08-10 18:12:09 -04:00
Fox-McCloud 989b629de4 crown and shoes 2016-08-08 19:36:41 -04:00
Fox-McCloud 0694a35da4 Formal Captain Update 2016-08-08 19:01:37 -04:00
Crazylemon64 7db4094a38 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation 2016-08-03 13:31:42 -07:00
Crazylemon64 6ca037d9f4 Makes things more consistent 2016-08-02 11:27:28 -07:00
Fox McCloudandGitHub 9ffc341f49 Merge pull request #5274 from TheBeoni/Coats 
Removes the obligatory tie from Blueshields and Detectives coat.
 2016-08-02 13:48:13 -04:00
Fox McCloudandGitHub db066016b2 Merge pull request #5273 from LittleBigKid2000/mourning-wood 
Fixes wooden coffins deconstructing into metal sheets
 2016-08-02 12:56:33 -04:00
Fox McCloudandGitHub dbd1cdb35a Merge pull request #5269 from GeneralChaos81/AtmosLockers 
Unique sprites for Engineers and Atmos tech lockers and wardrobes.
 2016-08-02 12:55:54 -04:00
Isaac Erwin 692e961e2f Fixes wooden coffins deconstructing into metal sheets 
Sure, I /could/ fix the messages and the fact that a wooden coffin is
deconstructed with a welder, but just think of it as slicing the hinges
apart because I'm too lazy.
Also makes sarcophaguses deconstruct into sandstone, but I don't think
I've ever seen those in-game.
🆑
fix: Coffins will now deconstruct into wood instead of metal.
/🆑
 2016-08-01 23:05:50 -04:00
Crazylemon64 bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07:00
TheDZDandGitHub 0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system 
Implements Fire System
 2016-08-01 19:39:50 -04:00
TheBeoni 67836ab234 Adds black tie to detectives locker. 2016-08-01 22:12:16 +02:00
GeneralChaos81 7c7d63b05f Unique sprites for Engineers and Atmos tech lockers and wardrobes. 2016-08-01 16:25:50 +10:00
Crazylemon64 bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Crazylemon64 ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Fox-McCloud bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
TheDZDandGitHub 6d095d50f5 Merge pull request #5102 from Fox-McCloud/reagent-refactors-continued 
More Reagent Refactoring and Cleanup
 2016-07-21 10:12:14 -04:00
Fox-McCloud 00a470fd6d removes stupid sdisabilities 2016-07-21 02:24:54 -04:00
Fox-McCloud a58c85941b More Reagent Refactoring 2016-07-19 14:06:41 -04:00
Fox-McCloud e6c02e3a2c Merge remote-tracking branch 'upstream/master' into mining-tweaks 2016-07-15 23:16:00 -04:00
Fox McCloudandGitHub 5107bca5dd Merge pull request #4899 from FlattestGuitar/loadouts 
Did someone say "loadouts"?
 2016-07-15 11:25:34 -04:00
Fox-McCloud 0fb2bfd8f1 Various Mining Tweaks 2016-07-14 22:07:04 -04:00
Fox McCloudandGitHub c803c4f752 Merge pull request #4911 from Kyep/exile_option 
Makes Exile & Lethal Injection Viable
 2016-07-11 21:21:16 -04:00
TheDZDandGitHub 5ba6e17739 Merge pull request #4917 from TullyBurnalot/BureaucracyUpdate 
Bureaucracy Update
 2016-07-11 21:20:06 -04:00
Mieszko Jędrzejczak 8f5ddf2be1 Fixes conflicts, conflicts. 2016-07-10 13:03:01 +02:00
TheDZDandGitHub 04d5219d6a Merge pull request #4929 from Fox-McCloud/hit-reactions 
Hit reactions
 2016-07-09 18:30:37 -04:00
Fox-McCloud 6a45502dd9 proper RD armor 2016-07-09 18:18:52 -04:00
Mieszko Jędrzejczak 30299a0b6b hon hon, mon ami! 2016-07-09 21:56:17 +02:00
Fox McCloudandGitHub 33c4d852f8 Merge pull request #4904 from TullyBurnalot/CardboardCoffins 
Resisting out of cardboard boxes is now possible
 2016-07-08 18:24:18 -04:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TullyBurnalot 2dce5ec8f1 Bureaucracy Update 
- Added Fax Guide to NT Rep, IAA, Captain, HoS and HoP Lockers
- Added Tape Box, with 6 Tapes, to NT Rep and IAA Office
- Added Recorder to NT Rep Locker
- Printers now start off with 60 toner
- Printers now alert nearby people when butts are copied
 2016-07-07 20:24:07 +01:00
Kyep de77c072fb Makes capital crime options consistent 2016-07-06 23:13:56 -07:00
Mieszko Jędrzejczak 8e0ac813ae Loadouts 2016-07-06 22:26:42 +02:00
TullyBurnalot 9793fc4b18 Resisting out of unwelded lockers is now possible 
Fixes #4880. Sorta.

- Can now resist out of unwelded lockers instantaneously
- By association, can now resist out of closed cardboard boxes

You can also use Toggle Open, this is just faster.
 2016-07-06 21:22:28 +01:00
TheDZDandGitHub 9e5fc84bb9 Merge pull request #4845 from Fox-McCloud/armor-rebalance 
TG Armor Rebalance
 2016-07-02 19:26:41 -04:00
Fox-McCloud 17d7f8113d tweaks 2016-07-02 01:45:44 -04:00
Fox-McCloud 1dc331b5a4 TG Armor Rebalance 2016-07-01 18:35:01 -04:00
Tigercat2000 82091296bd Merge remote-tracking branch 'upstream/master' into bay_equipping 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preference/preferences.dm
	code/modules/client/preference/preferences_toggles.dm
 2016-06-27 08:20:49 -07:00
Krausus eecf8ba93b to_chat fixes 
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
 2016-06-24 18:36:50 -04:00
TheDZDandGitHub 5e2d7920c7 Merge pull request #4713 from DaveTheHeadcrab/engineer_workboots 
Engineer Workboots
 2016-06-22 14:03:04 -04:00
Tigercat2000 5d48cc22b7 Merge remote-tracking branch 'upstream/master' into bay_equipping 
Conflicts:
	code/modules/client/preference/preferences.dm
 2016-06-19 16:28:57 -07:00
TheDZDandFox McCloud 931f25c5f4 Makes it so lockers are no longer a safe place to hide from Lord Teslaloth (#4704) 2016-06-19 14:28:08 -04:00