cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,677 Commits 26 Branches 2 Tags
2b3a4a3deffca104f0fc6c8c73679ec7abc8170c
Commit Graph

5970 Commits

Author SHA1 Message Date
variableundefined
5ca3a34d3b Merge pull request #16720 from Qwertytoforty/grabbing-your-attention 
Makes revive, biodegrade, and freedom break grabs
 2021-09-17 22:12:08 -05:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines 
Adds defines for damage flags
 2021-09-17 22:10:20 -05:00
variableundefined
d0785adc20 Merge pull request #16700 from Qwertytoforty/thinking-with-cult-portals 
Adds an item that lets cultists turn teleport runes into portals
 2021-09-17 21:14:27 -05:00
variableundefined
6cbb29beb2 Merge pull request #16702 from SabreML/ghost-poll-names 
Fixes some ghost poll chat messages being incorrect
 2021-09-17 20:39:58 -05:00
variableundefined
cc29b0f7ad Merge pull request #16711 from Vi3trice/and-my-axe 
Fix - Removes twohanded wielding when equipping the item to a different slot
 2021-09-17 20:34:13 -05:00
variableundefined
0c78315cf1 Merge pull request #16685 from datlo/credit-spam-removal 
Removes service borgs being able to print credits
 2021-09-16 20:51:28 -04:00
Qwertytoforty
4a4522641f Removes uneeded procs, updates ability desc 2021-09-16 13:17:26 -04:00
Qwertytoforty
f3337539b5 Makes revive, biodegrade, and freedom break grabs 2021-09-15 22:11:05 -04:00
Vi3trice
6cc5952788 Cleaned it up, allows pocketing of deswords 2021-09-14 02:54:50 -04:00
Vi3trice
20ac4341f3 Changed return value 2021-09-14 02:15:05 -04:00
Vi3trice
21d7fbc829 Simpler 2021-09-13 21:35:25 -04:00
Vi3trice
e555d1e2b8 Remove the twohanded state if the item is equipped on the back 2021-09-13 21:05:11 -04:00
SabreML
8dfab33829 Ghost poll names 2021-09-12 22:56:52 +01:00
Qwertytoforty
ce260375ff Finishing touches 2021-09-12 14:57:33 -04:00
Qwertytoforty
2f25c2100f Merge remote-tracking branch 'upstream/master' into thinking-with-cult-portals 2021-09-11 18:00:52 -04: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
6e0e36f9c1 things now work 2021-09-10 17:13:30 +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
Fox McCloud
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
variableundefined
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
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
E-MonaRhg
a99fc879df Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-09-06 19:32:39 +02:00
variableundefined
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
variableundefined
188496c678 Merge pull request #16595 from SabreML/clothing-migration 
[IDB IGNORE] Clothing .dmi file organisation
 2021-09-01 19:44:59 -05:00
variableundefined
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
variableundefined
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
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
77737581c1 Fancy windows? I think so good sir! 2021-08-28 15:11:07 +01:00
Qwertytoforty
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
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
SabreML
1c14cf733b Light delay V1 2021-08-19 01:19:24 +01:00
Fox McCloud
5af76d92cc Merge pull request #16498 from shmabuu/Fake-Blindfold 
Adds Fake Blindfold
 2021-08-18 16:02:42 -04:00
E-MonaRhg
6e9cd90cfc Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-17 17:45:57 +02:00
E-MonaRhg
97996dd4de Just a singular letter letter addition (#16556) 2021-08-16 22:39:45 +01:00
E-MonaRhg
101551865f Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-08-14 17:42:06 +02:00
E-MonaRhg
c895e47ccb Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-13 19:26:44 +02: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