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

3872 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
SabreML
6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +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
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
variableundefined
99e8487bfd Merge pull request #15656 from Qwertytoforty/I-guess-I-port-stuff-now-huh 
Adds supermatter sliver steal and plutonium core steal objective from TG
 2021-08-11 16:05:24 -04:00
SabreML
c161e34a4d Possessed Blade poll 2021-08-11 16:20:59 +01:00
Cocacolagua
fa1554a21f no more helmet protection 2021-08-10 10:58:12 -03:00
S34NW
fa88d21ae4 Merge branch 'master' into solgov_ERT 2021-08-06 15:47:40 +01:00
E-MonaRhg
ecd50aaf71 Suggested stuff + security bomber jacket and renamed hard hats 2021-08-06 14:50:11 +02:00
E-MonaRhg
c652bbfa10 Initial departmental clothing vendors commit 2021-08-05 22:01:05 +02: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
Farie82
398ac7b286 Can't have infinite EMP implant charges anymore (#16469) 
* Can't have infinite EMP implant charges anymore
 + Makes the EMP implant call empulse async

* pulse pulse
 2021-08-02 13:47:24 +01:00
AffectedArc07
e46f67810a Cleans up the TODOs I left all over the codebase (#16443) 
* Removes command_name() proc

* Removes GLOB.teleportlocs + GLOB.ghostteleportlocs

* Clean up IPIntel

* Tweaks karma logging

* Tweaks time
 2021-07-28 13:45:18 -04:00
E-MonaRhg
ee47ea90cb Makes the advanced defib give heart attacks as intended 2021-07-27 19:02:29 +02:00
E-MonaRhg
51a36cfb9f Makes the advanced defib emaggable + sprite tweaks 2021-07-27 18:11:12 +02:00
E-MonaRhg
4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
variableundefined
e788278f57 Merge pull request #16397 from Sirryan2002/ERTFix 
Jani ERT Equipment Tweak
 2021-07-26 20:37:03 -04:00
variableundefined
ec7206e612 Merge pull request #15599 from SabreML/flyswatter-fix 
Fixes the flyswatter not swatting flies
 2021-07-26 13:36:54 -04:00
LordShekelstein
ab0fac5d04 Gives the Singularity Hammer a much needed buff. (#16276) 
* buffs the singularityhammer

* Sets the force back to 5... why did I put a 1 there?
 2021-07-26 18:13:01 +01:00
SabreML
2c0ae9c500 Refactors the 'Examine' status tab (#16330) 
* Removes the 'Examine' tab

* Revert "Removes the 'Examine' tab"

This reverts commit 0dd01722c9.

* Initial system and misc items

* Atmospherics

* Engineering

* Medical

* Mobs

* Stacks

* Structures

* Turfs & Weapons

* Final stuff and bad documentation

* Sheer laziness
 2021-07-26 18:11:57 +01:00
hal9000PR
7906e66871 Adds feedback for defibbing and scanning husked people (#16357) 
* husk

* extra space

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

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-26 18:08:37 +01:00
datlo
01dfe5c7b7 Remove freeform core quotes (#16423) 2021-07-25 15:50:40 +01:00
variableundefined
ea316e7fca Merge pull request #15902 from AffectedArc07/tg-ids 
"New" ID card sprites
 2021-07-25 08:27:28 -04:00