cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 23:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,214 Commits 26 Branches 2 Tags
3bbe06f3fecac78df5a6ed641b1525e7cdab54a1
Commit Graph

24045 Commits

Author SHA1 Message Date
Farie82
3bbe06f3fe Makes it possible to announce the ERT denial to the crew (#16842) 
* Makes it possible to announce the ERT denial to the crew

* can deny ERT now when sender is KO or has no headset
refactored the stuff around it

* Apply suggestions from code review

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

* Sabre's review
Message format for the input
Early return

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-11-05 10:18:53 +01:00
datlo
d94210031b Refactor C4, subtypes, and airlock ex_act (#16995) 
* Refactor C4 and Airlock ex_act

* update uplink desc

* Replace ismob by carbon, clarify comment

* remove unnecessary ismob check

* replace destroy by qdel, fix comment

* auto doc comments, add else condition

* Add comment to shaped c4

* Shortens shaped boom proc, make airlocks more resistant against light ex
 2021-11-05 10:12:09 +01:00
hal9000PR
3b7e9fee93 refactors butchering of humans with chainsaw/meatcleaver (#16812) 
* traits

* examine

* I am incapable of writing

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

* people

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-11-05 09:11:10 +01:00
SabreML
1c3c2c22ad Name Capitalisation Tweaks (Weapons) (#16906) 
* Weapon names

* Assault rile

* More #coding_chat tweaks

Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.

* Missed these
 2021-11-04 19:47:31 +01:00
Paulo Elienay II
7abc485a78 Unable to remove solar panel assembly from a bag of holding #17021 (#17023) 
* fix: #17021

* style: project style

* refactor: project style

* refactor: requested changes

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-11-04 19:00:21 +01:00
variableundefined
4456caf3cb Merge pull request #17028 from paulo-e/fix/17016 
Ash Walker wasn't an offstation role #17016
 2021-11-03 20:07:07 -05:00
Elienay Albuquerque
1660df05ff fix: requested changes 2021-11-03 16:55:04 -03:00
Elienay Albuquerque
fa503a9fc8 fix: #17016 2021-11-03 10:56:20 -03:00
variableundefined
c6465fc014 Merge pull request #16942 from PacifistDalek/hydroponics-sprites-2 
Whole bunch of Hydroponics Sprite changes (redux)
 2021-11-02 23:32:48 -05:00
variableundefined
1b04314884 Merge pull request #16783 from Sirryan2002/WinterRuin 
Reworks the Snow Biodome Ruin
 2021-11-02 23:24:35 -05:00
variableundefined
3c663c12cf Merge pull request #16561 from hal9000PR/AHA-guidelines-on-outcome-oriented-resuscitation 
Compression only CPR
 2021-11-02 23:18:04 -05:00
variableundefined
568d27a5ee Merge pull request #16994 from lewcc/oof-ow-my-organs 
Improve organ damage feedback
 2021-11-02 08:54:53 -05:00
Fox McCloud
74f8aeb61d Merge pull request #16951 from SabreML/swarmer-initialisation 
Fixes swarmers initialising multiple times
 2021-11-01 18:21:53 -04:00
Fox McCloud
b9d322bbbe Merge pull request #17005 from paulo-e/fix/17003 
Can't dispose abstract items #17003
 2021-11-01 18:01:37 -04:00
Fox McCloud
13a749c452 Merge pull request #16976 from SabreML/ipc-damage-overlays 
Fixes IPC damage overlays not updating
 2021-11-01 18:00:52 -04:00
variableundefined
d2d4ec19b4 Merge pull request #16989 from rythenx/add-fax-log 
add a notification when replying to fax
 2021-10-31 22:33:50 -05:00
variableundefined
9996b7bfa3 Merge pull request #16990 from Vi3trice/aperture-shower-curtain 
Adds feedback to the Telegun's target setting, and applies it to the current shot
 2021-10-31 22:33:24 -05:00
variableundefined
416f330481 Merge pull request #16999 from lewcc/xeno-orbit-menu 
Add xenomorph section to orbit menu
 2021-10-31 22:26:11 -05:00
variableundefined
c0e21aa64e Merge pull request #16996 from hal9000PR/bnuuy 
Adds Bunnies.
 2021-10-31 22:24:31 -05:00
Elienay Albuquerque
e54d406ffb refactor: more requested changes 2021-10-29 16:18:49 -03:00
Paulo Elienay
c767d4b6e6 fix: reverts last commit and adds comment 2021-10-29 06:04:35 -03:00
Elienay Albuquerque
e3be4db007 refactor: requested changes 2021-10-28 17:57:42 -03:00
Elienay Albuquerque
e0eb271a31 fix(disposal): DRODEL items now ignored 2021-10-28 16:16:34 -03:00
Paulo Elienay
8b36807988 fix(17003): can't dispose abstract items 
Abstract items (such as slapper) should't be allow to be disposed away.
 2021-10-28 12:47:40 -03:00
lewcc
8d5409d4ff Add xenomorph section to orbit menu 2021-10-27 12:36:15 -04:00
PacifistDalek
f486448a95 Food Cart Refactor (#16869) 
* Food Cart Refactor

* delete unused old sprites

* No longer can be deconstructed or destroyed into smartfridge parts
 2021-10-26 23:33:03 +01:00
SabreML
945e00e497 IAA locker, spare headsets, and general locker cleanup (#16440) 
* Locker + Bookcase tweaks

* HoS flask
 2021-10-26 23:09:45 +01:00
hal9000PR
24459904eb henk review 
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-10-26 21:38:22 +01:00
Luc
431c1fe368 Update code/modules/surgery/organs/pain.dm 
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-10-26 16:03:45 -04:00
hal9000PR
e5afa54965 Merge remote-tracking branch 'upstream/master' into bnuuy 2021-10-26 19:53:15 +01:00
hal9000PR
f095264807 bnuuy 2021-10-26 19:47:41 +01:00
lewcc
2c20cce543 Ehhh why not 2021-10-25 20:04:37 -04:00
lewcc
cf5f487ac9 Clean up pain messages a bit more 2021-10-25 20:01:51 -04:00
lewcc
f7999fee26 Add more organ pain messages 2021-10-25 19:47:58 -04:00
SabreML
a9ccc59e58 Loop exclusion 
Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-10-25 10:34:12 +01:00
Vi3trice
a3d515ce4e Makes the telegun a wee bit more sensible 2021-10-23 12:25:11 -04:00
rythenx
25a333274d Update code/modules/admin/topic.dm 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-10-23 11:53:08 -04:00
rythenx
97edcd4e6e Update code/modules/admin/topic.dm 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-10-23 10:54:48 -04:00
matttheficus
58d3c21ea8 goodbye you annoying spam (#16970) 2021-10-23 10:49:20 +01:00
Shawn Hind
c33d100cbd add a notification when replying to fax 2021-10-22 21:30:56 -04:00
Sirryan2002
e83e81a8d2 bruh (#16983) 2021-10-22 11:26:42 +01:00
Fox McCloud
a33cd4325a Merge pull request #16560 from AffectedArc07/multi-instance-support 
[READY] Multi instance support
 2021-10-20 15:25:26 -04:00
SabreML
c25f250a91 UpdateDamageIcon() 2021-10-20 16:25:23 +01:00
matttheficus
75550c3f8c runtimes bad (#16972) 2021-10-19 10:45:49 +01:00
E-MonaRhg
f9c672ffa2 A lesson in testing your PRs (#16969) 2021-10-18 16:15:54 +01:00
AffectedArc07
e843d297bf Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-17 20:49:07 +01:00
variableundefined
9470fd0387 Merge pull request #16889 from AffectedArc07/cui-cdl 
Moves CUI entries to CDL
 2021-10-17 13:57:14 -05:00
variableundefined
8d4b75690e Merge pull request #16873 from PacifistDalek/ghost-deck-of-cards 
Ghosts can no longer shuffle cards
 2021-10-17 13:47:26 -05:00
variableundefined
33f408ed02 Merge pull request #16849 from ProfessorDonut/danger-noodle-pai 
Snake icon and hissing speech verb for pAI
 2021-10-17 13:45:12 -05:00
variableundefined
56003f88ac Merge pull request #16884 from Qwertytoforty/A-simple-mob-problem 
Adds a malf AI upgrade for engineering borgs, adds zipties to all emaged borgs.
 2021-10-17 13:44:09 -05:00