cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 10:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,826 Commits 26 Branches 2 Tags
5df60f30600b16a53ede3c323f5df084d400a2df
Commit Graph

2199 Commits

Author SHA1 Message Date
variableundefined
5df60f3060 Merge pull request #16794 from Vi3trice/you-shall-not-pass 
Fix - Ordinal railings block properly, rotations are done in 45°
 2021-09-24 20:21:03 -05:00
Vi3trice
0349f2cddd comment 2021-09-24 13:45:48 -04:00
Vi3trice
398c471698 Might as well make it its own check if we're going to use it in two places 2021-09-24 13:39:27 -04:00
Vi3trice
b145ab1f4c Corners aren't cosmetic anymore 2021-09-24 13:04:04 -04:00
S34N
6b36aabfc0 Update code/game/objects/structures/fence.dm 
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-09-24 14:45:23 +01:00
S34NW
01720b93bb farie pt2 2021-09-24 12:06:45 +01:00
S34NW
f45117b9fe farie review 2021-09-24 11:41:03 +01:00
S34NW
215ec7cbe3 return nesting mistake 2021-09-24 11:11:38 +01:00
S34NW
622adb4ba5 makes uncuttable fences dismantlable 2021-09-24 11:07:31 +01:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines 
Adds defines for damage flags
 2021-09-17 22:10:20 -05:00
Vi3trice
42571c3f4d Gives the wheelchair its own stack value 2021-09-12 12:18:35 -04: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
S34N
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
variableundefined
b0c4dd605a Merge pull request #16606 from S34NW/we_live_in_an_electrochromic_society 
Constructable electrochromic windows
 2021-09-08 08:52:43 -05: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
variableundefined
9a62622fbc Merge pull request #16520 from SabreML/fix-bundle-4 
Fix bundle #4
 2021-09-06 22:29:10 -05:00
variableundefined
82b34ad8ed Merge pull request #15783 from E-MonaRhg/just-defibrillator-things 
More compact defibs: Electric boogaloo
 2021-09-06 21:56:46 -05:00
variableundefined
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
SabreML
c122e67693 Merge remote-tracking branch 'upstream/master' into fix-bundle-4 2021-09-02 17:48:42 +01:00
S34N
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
S34N
d57a653c12 pda box and painter, fish kit and ammo box, pew wood return (#16616) 2021-08-30 13:55:43 +01:00
S34N
267e3d2967 Apply suggestions from code review 
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
 2021-08-30 13:20:12 +01:00
variableundefined
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
77737581c1 Fancy windows? I think so good sir! 2021-08-28 15:11:07 +01:00
S34NW
14004ce2f2 fax machines, chairs, pews, corpo sofa 2021-08-22 16:34:55 +01:00
S34N
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
E-MonaRhg
101551865f Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-08-14 17:42:06 +02:00
variableundefined
aa820ab123 Merge pull request #16291 from SabreML/brass 
Craftable brass sheets
 2021-08-13 23:40:03 -04:00
SabreML
5cd4e55063 'Unrestricted access from direction' for windoors (#16501) 
* Unrestricted Windoor Directions

* Mapping helpers
 2021-08-12 13:05:42 +01:00
S34NW
6234346ff0 Revert "Revert "Adds glass floors" (#16524)" 
This reverts commit 517f5e8304.
 2021-08-11 21:29:00 +01:00
variableundefined
517f5e8304 Revert "Adds glass floors" (#16524) 2021-08-11 21:18:49 +01:00
variableundefined
d8bfbe307a Merge pull request #15929 from S34NW/tgglassfloors 
Adds glass floors
 2021-08-11 16:08:09 -04:00
SabreML
1ce82a4dea Sign teleportation 
Also a small refactor (Bigger one needed later).
 2021-08-11 15:52:23 +01:00
S34NW
ea87e351a2 Merge branch 'master' into tgglassfloors 2021-08-05 15:17:09 +01:00
SabreML
02fe0876f5 Fix bundle #3 (#16411) 
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Review 2

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-08-05 11:04:27 +01:00