cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 16:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,285 Commits 29 Branches 2 Tags
a99fc879df4a9c3b638c19266b64aca7e9eb39c0
Commit Graph

9290 Commits

Author SHA1 Message Date
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
variableundefined
188496c678 Merge pull request #16595 from SabreML/clothing-migration 
[IDB IGNORE] Clothing .dmi file organisation
 2021-09-01 19:44:59 -05:00
S34N
d57a653c12 pda box and painter, fish kit and ammo box, pew wood return (#16616) 2021-08-30 13:55:43 +01: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
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
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
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
566b246a24 Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-16 21:32:35 +02:00
SabreML
d03fc7ea1c Update mapping_helpers.dm (#16538) 2021-08-15 01:18:05 +01:00
variableundefined
aa820ab123 Merge pull request #16291 from SabreML/brass 
Craftable brass sheets
 2021-08-13 23:40:03 -04:00
E-MonaRhg
c895e47ccb Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-13 19:26:44 +02:00
SabreML
5cd4e55063 'Unrestricted access from direction' for windoors (#16501) 
* Unrestricted Windoor Directions

* Mapping helpers
 2021-08-12 13:05:42 +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
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
Cocacolagua
fa1554a21f no more helmet protection 2021-08-10 10:58:12 -03:00
shmabuu
61330ef44a i do be seeing part 2 2021-08-07 01:36:50 -07: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
Sirryan2002
9bf4d7ad84 Sets a Mob Cap for Giant Spiders (#15923) 
* Counting and Capping for Giant Spider Spawning

* Moves magic numbers into defines

* Apply suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* Update code/controllers/subsystem/mobs.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* makes requested changes

* I hope to god this fixes this

* implements requested changes

* removes double parent call

Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-08-05 21:23:01 +01:00
E-MonaRhg
c652bbfa10 Initial departmental clothing vendors commit 2021-08-05 22:01:05 +02:00
S34NW
ea87e351a2 Merge branch 'master' into tgglassfloors 2021-08-05 15:17:09 +01:00
hal9000PR
b2d46ba7bc fix (#16485) 2021-08-05 14:42:33 +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
S34N
e75d8357eb i touched the intercoms (#16483) 2021-08-05 10:55:17 +01:00
SabreML
bb82a58c8f Merge remote-tracking branch 'upstream/master' into brass 2021-08-04 19:32:12 +01:00
SabreML
3a284ec0b3 One character PR time (#16477) 2021-08-04 02:41:26 -04:00
E-MonaRhg
4814d4b29a Fixes the floor painter icon state (#16473) 2021-08-03 00:25:08 +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
warior4356
72559ddf70 Fixes telekinesis crafting appearing at mob's feet (#16337) 
* Fixes TK building in strange places.

* Minor formatting tweaks

* replaces usr.loc
 2021-07-30 11:58:09 +01:00
Qwertytoforty
c45a359769 Grammer and style 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 18:21:58 -04: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
Fox McCloud
9df0c803cc Merge pull request #16420 from SabreML/fire-nerf 
Fire-safety closet extinguisher tweak
 2021-07-27 13:11:17 -04:00
variableundefined
e788278f57 Merge pull request #16397 from Sirryan2002/ERTFix 
Jani ERT Equipment Tweak
 2021-07-26 20:37:03 -04:00
variableundefined
838dde54ec Merge pull request #15201 from SabreML/pull-facing 
Face towards structures while pulling them
 2021-07-26 20:26:44 -04:00
Fox McCloud
4dffbd67ed Merge pull request #15139 from SabreML/rainbow-gibs 
Species Gib Colours
 2021-07-26 15:18:32 -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