cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 10:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,466 Commits 26 Branches 2 Tags
c856472ff79a21a2ce7e216c4f5e99e018eb62b9
Commit Graph

1074 Commits

Author SHA1 Message Date
Fox McCloud
c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs 
Adds Unique Identifiers with Topic and VV Integration
 2016-09-12 15:32:20 -04:00
GeneralChaos81
c5e9b0514f Redo of clown/mime door fix. 2016-09-12 20:11:54 +10:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04: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
TheDZD
f5577b4a8f add_logs() un-fuckery 2016-08-29 17:27:56 -04:00
Crazylemon64
05ebb18b3d Fixes a closet runtime 2016-08-22 22:14:31 -07:00
Krausus
ae0f60c06b Makes girders non-bulletproof 
Also, minor refactoring
 2016-08-21 11:12:48 -04:00
Isaac Erwin
8b9b28a3c5 Fixes welded fireclosets not showing up properly 2016-08-13 13:14:30 -04:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
TheDZD
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
031dd2bb3d Iiiiit's merge conflict time! 
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
 2016-08-07 23:42:02 -07:00
TheDZD
44ae3a4a68 Merge pull request #5309 from Fox-McCloud/field-generators 
Field Generator Cleanup, Singularity Fixes,
 2016-08-03 23:29:09 -04:00
Krausus
c8989b36e1 Fixes cremation of self-deleting mobs 2016-08-03 19:21:36 -04:00
Fox-McCloud
5533c36af3 Field Generator Cleanup, Singularity Fixes, 2016-08-03 17:17:04 -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 McCloud
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 McCloud
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 McCloud
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
TheDZD
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
95dcbbc77b cleaning up old code 2016-07-29 18:01:59 -04:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Tigercat2000
288af9f92c Revert "Merge pull request #4739 from monster860/vg-parallax" 
This reverts commit 451c934379, reversing
changes made to 64f26d999f.

Conflicts:
	SQL/paradise_schema.sql
	SQL/paradise_schema_prefixed.sql
 2016-07-28 15:48:27 -07:00
monster860
b2cb87edc9 Merge branch 'master' into vg-parallax 2016-07-28 16:45:10 -04:00
Fox-McCloud
0870c66303 tweak 2016-07-26 14:02:07 -04:00
Fox-McCloud
d83fe43331 tweak 2016-07-22 19:25:07 -04:00
Fox-McCloud
451044863e Alt Click Madness 2016-07-22 16:09:16 -04:00
TheDZD
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 McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins 
Crazypilot's Space Ruins Port
 2016-07-15 22:55:51 -04:00
Fox McCloud
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 McCloud
c803c4f752 Merge pull request #4911 from Kyep/exile_option 
Makes Exile & Lethal Injection Viable
 2016-07-11 21:21:16 -04:00
TheDZD
5ba6e17739 Merge pull request #4917 from TullyBurnalot/BureaucracyUpdate 
Bureaucracy Update
 2016-07-11 21:20:06 -04:00
Krausus
355fb3c080 Fixes morgue updating and removes VGhooks 2016-07-11 17:39:21 -04:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
Mieszko Jędrzejczak
8f5ddf2be1 Fixes conflicts, conflicts. 2016-07-10 13:03:01 +02:00
TheDZD
04d5219d6a Merge pull request #4929 from Fox-McCloud/hit-reactions 
Hit reactions
 2016-07-09 18:30:37 -04:00