cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-16 08:37:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
11906 Commits
Author SHA1 Message Date
Qwertytoforty 2f25c2100f Merge remote-tracking branch 'upstream/master' into thinking-with-cult-portals 2021-09-11 18:00:52 -04:00
E-MonaRhg 1c83d795de Re-adds detective clothes to their locker 
Detectives would be missing a lot of their clothes if not for this.
 2021-09-11 20:35:07 +02:00
E-MonaRhg f4e58a0961 Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-09-11 20:26:54 +02:00
datlo 9fc36f02f2 Update RSF.dm 2021-09-11 18:25:27 +02:00
S34NW 9dc099ddc3 you now vault over railings, instead of weird things 2021-09-11 14:11:20 +01:00
S34NW 417f45eb88 more farie code things 2021-09-11 11:40:19 +01:00
S34NW fa8d8515af farie fixes 2021-09-11 11:18:39 +01:00
S34NW 235ee0c4ac we dont need these args either 2021-09-11 09:10:12 +01:00
S34NW e41c8ec849 railing rotate 2021-09-11 09:08:57 +01:00
S34NW 1d6a0c643b projectiles and big fences are nice too 2021-09-10 22:26:35 +01:00
S34NandGitHub eeff98224f Update code/game/objects/structures/railings.dm 2021-09-10 22:20:37 +01:00
S34NW 6d491f96a8 okay, projectiles and bumping now properly works all the time 2021-09-10 22:07:46 +01:00
S34NW 0c4dcd1b62 projectiles can pass 2021-09-10 19:07:02 +01:00
S34NW 6e0e36f9c1 things now work 2021-09-10 17:13:30 +01:00
S34NW 64fa0dbe3d shocking fences, railing layering, logical dirs 2021-09-10 16:28:01 +01:00
S34NW 5fde45d366 fences and railings 2021-09-10 15:55:22 +01:00
Fox McCloud 2119063805 Removes Secborg, Tweaks Borgs, Adds Peacekeepers 2021-09-09 14:18:16 -04:00
variableundefinedandGitHub b0c4dd605a Merge pull request #16606 from S34NW/we_live_in_an_electrochromic_society 
Constructable electrochromic windows
 2021-09-08 08:52:43 -05:00
Fox McCloudandGitHub 1d47d4a93c Merge pull request #16648 from AffectedArc07/mutes-glob 
Moves mutes to a GLOB
 2021-09-08 09:01:13 -04:00
AffectedArc07 b0e9db64bd Revert "Merge pull request #16520 from SabreML/fix-bundle-4" 
This reverts commit 9a62622fbc, reversing
changes made to 841ad0f1fd.
 2021-09-07 16:16:40 +01:00
AffectedArc07 fce2828724 Moves mutes to a GLOB 2021-09-07 15:09:37 +01:00
variableundefinedandGitHub c2664eec0d Merge pull request #16311 from S34NW/does-anyone-else-hate-genetics 
Replaces genetics xray vision with other vision genes
 2021-09-06 23:16:04 -05:00
variableundefinedandGitHub 9a62622fbc Merge pull request #16520 from SabreML/fix-bundle-4 
Fix bundle #4
 2021-09-06 22:29:10 -05:00
variableundefinedandGitHub 82b34ad8ed Merge pull request #15783 from E-MonaRhg/just-defibrillator-things 
More compact defibs: Electric boogaloo
 2021-09-06 21:56:46 -05:00
variableundefinedandGitHub 5a9b70b7fb Merge pull request #16447 from S34NW/outline_port 
Ports item hover outline
 2021-09-06 21:42:50 -05:00
variableundefinedandGitHub 2354619f17 Merge pull request #16525 from S34NW/glass_floors_2 
Glass floors attempt 2
 2021-09-06 19:10:44 -05:00
E-MonaRhg 23e9083d07 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-09-06 19:47:03 +02:00
E-MonaRhg a99fc879df Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-09-06 19:32:39 +02:00
Fox McCloud 23164e354b conflicts 2021-09-06 04:06:47 -04:00
variableundefinedandGitHub dd17035c1f Merge pull request #16567 from SabreML/fluorescent-lights 
Adds a short warm-up time when turning on a light
 2021-09-05 16:05:21 -05:00
Qwertytoforty e9761d0e18 Draw 2 circles 2021-09-03 17:34:43 -04:00
SabreML c122e67693 Merge remote-tracking branch 'upstream/master' into fix-bundle-4 2021-09-02 17:48:42 +01:00
variableundefinedandGitHub 188496c678 Merge pull request #16595 from SabreML/clothing-migration 
[IDB IGNORE] Clothing .dmi file organisation
 2021-09-01 19:44:59 -05:00
S34NGitHubSteelSlayer
 		3defd46037 Apply suggestions from code review 
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-09-01 19:31:20 +01:00
S34NW a6a79dca1e windows remember their old colours 2021-08-30 15:56:04 +01:00
S34NandGitHub d57a653c12 pda box and painter, fish kit and ammo box, pew wood return (#16616) 2021-08-30 13:55:43 +01:00
S34NGitHubdearmochi
 		267e3d2967 Apply suggestions from code review 
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
 2021-08-30 13:20:12 +01:00
variableundefinedandGitHub d1ee992ba1 Merge pull request #16519 from Cocacolagua/head-bonk 
Helmets no longer protect you from bible brain damage
 2021-08-29 14:47:30 -05:00
variableundefinedandGitHub 70769e6953 Merge pull request #16571 from S34NW/tg_object_sprites_2 
[REQUIRES #16569] TG sprite project: item/obj (part 2)
 2021-08-29 14:42:52 -05:00
variableundefinedandGitHub 7964ea23ca Merge pull request #16569 from S34NW/tg_object_sprites 
[REQUIRES #16571] TG sprite project: item/obj (part 1)
 2021-08-29 14:42:18 -05:00
S34NW 68c90f791c steel review 2021-08-28 16:09:08 +01:00
S34NW 89b7b016a1 ahem, you saw nothing 2021-08-28 15:28:17 +01:00
S34NW 523c7786b2 spawner 2021-08-28 15:17:31 +01:00
S34NW 77737581c1 Fancy windows? I think so good sir! 2021-08-28 15:11:07 +01:00
QwertytofortyGitHubFarie82dearmochiSabreML
 		f628ec3333 Allows nuke core containers to be broken open (#16570) 
* Allows nuke core containers to be broken open

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Improves unload, removes duplicate, better logging, changes name on cracking open

* Update code/game/objects/items/theft_items.dm

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

* Some of sabres stuff

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Fixes engineers / atmos techs getting objective, boldnotice

* Testing to figure out why this is conflicted

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-08-25 15:50:24 +01:00
SabreML 6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
S34NW 14004ce2f2 fax machines, chairs, pews, corpo sofa 2021-08-22 16:34:55 +01:00
S34NGitHubSabreML
 		825d280ecc Fixes flying/jaunting/floating mobs breaking glass tables. (#16583) 
* makes flying/jaunting things not smash tables

* Update code/game/objects/structures/tables_racks.dm

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Update code/game/objects/structures/tables_racks.dm

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-08-21 20:49:28 +01:00
Mieszko Jedrzejczak 559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
S34NW e7e4e6beb6 new lights, dupe sprite removal, APC cell clarity 2021-08-20 12:52:39 +01:00