cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,092 Commits 26 Branches 2 Tags
4e40353cfa9375bcf2ebd1182e4591663d36fedc
Commit Graph

5996 Commits

Author SHA1 Message Date
variableundefined
066cd3be7b Merge pull request #16932 from matttheficus/TrayQOL 
Serving Tray Quality of Life - 8 Slots
 2021-10-17 13:51:00 -05:00
variableundefined
edd1781e38 Merge pull request #16943 from E-MonaRhg/more-carpets 
Carpet bomb your station: 8 more carpet types and a carpet cargo crate
 2021-10-17 13:30:03 -05:00
SabreML
146351ae82 Cigarette overlay update (#16936) 2021-10-15 11:00:26 +01:00
E-MonaRhg
310616cdf3 Carpet bomb your local station 2021-10-14 20:23:11 +02:00
matttheficus
468ff53ac7 8 because i cant count 2021-10-13 17:27:38 -04:00
matttheficus
ee16debc62 oh god does this work 2021-10-13 17:22:53 -04:00
dearmochi
28f0035172 Prevent stunbatons from stunning AIs (#16919) 2021-10-11 20:49:38 +01:00
Mieszko Jędrzejczak
7c39eafafe midori-san (#16856) 2021-10-09 17:06:43 +01:00
Qwertytoforty
40eb870732 Polishes up and fixes bugs with the syndicate teleporter (#16844) 
* Polishes up and fixes bugs with the syndicate teleporter

* snake case

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-10-07 16:38:23 +01:00
Farie82
2d13c33906 Makes laser pointers not go through walls (#16871) 
* Makes laser pointers not go through walls

* Add comment

* Use the laserpointer instead as center
 2021-10-04 20:15:10 +01:00
Vi3trice
4b29431236 Makes the fireaxe visible on the back, and wow one line fix again? 2021-10-03 18:51:51 -04:00
AffectedArc07
129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
Fox McCloud
ee22c8d4ee Refactors Item Blood Overlays (#16826) 
* Refactors Item Blood Overlays

* update

* remove blood color changing
 2021-10-01 21:57:54 +01:00
Fox McCloud
0eac5b812c Merge pull request #16798 from SabreML/telescopic-blood-overlays 
Blood overlay fix for telescopic weapons
 2021-09-28 00:31:41 -04:00
Fox McCloud
1c40951338 Ports Cloth Golems 2021-09-24 19:48:15 -04:00
SabreML
51c2c8840d Telescopic baton/scythe blood overlay fix 2021-09-25 00:11:56 +01:00
variableundefined
b44432b8b8 Merge pull request #16667 from Fox-McCloud/secborg-purge-borg-tweaks 
Removes Secborg, Tweaks Borgs: Combat Rework Edition
 2021-09-21 08:41:22 -05:00
Stokes52
119385057b Apply changes from AffectedArc's code review 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-09-19 07:43:00 -07:00
Stokes52
6c3675ad0c Add voice modulator mask for crafting and traitor uplink 2021-09-19 07:42:21 -07:00
variableundefined
522390c0b9 Merge pull request #15675 from Fox-McCloud/his-grace-ascended 
Implements Better His Grace
 2021-09-18 15:26:30 -05:00
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
Fox McCloud
b38a1e2fd7 removal of peacekeeper 2021-09-17 22:04:28 -04: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
Fox McCloud
2119063805 Removes Secborg, Tweaks Borgs, Adds Peacekeepers 2021-09-09 14:18:16 -04: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