cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 13:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,454 Commits 26 Branches 2 Tags
400a25dc01311201e8bc5fc7da667ba1e18a2999
Commit Graph

9122 Commits

Author SHA1 Message Date
AffectedArc07
c7fd6681a1 Gamemode configuration 2021-05-16 15:15:05 +01:00
Farie82
e3ba0203b2 Adds grouped spawners. Makes spawning unique things easier. (#15956) 
* Adds unique spawners
Makes spawning unique things easier.

* Refactor + comments update

* Some more info

* Slight refactor and path change.
group_id instead of key_override
comment changes

* File name change

* isnull check. Makes 0 as value valid
 2021-05-16 11:41:06 +01:00
S34N
ae6f6148c2 Solgov tweaks (#15896) 
* marines, solgov, and more!

* belts are belts

* forgot da hat

* swapped guns around, loadout hat no longer strong

* Update code/datums/outfits/outfit_admin.dm

* updated shading on uniforms

* yeets a null entry

* gas masks, flipped caps

* renamed gas masks

* merge conflicts

* dmi conflicts confuse me

* ARG mag update
 2021-05-16 11:38:16 +01:00
SabreML
3d6e072464 A lot more Cult fixes (#15161) 
* Some fixes

1: ERT members can no longer be given as an assassinate/sacrifice antag objective.
2. Cultists attempting to teleport to a deleted rune will no longer be teleported into nullspace.
3. Re-ordered the cult Blood Rites spell code because it was bugging me. (sorry qwerty)

* Cult stuff

1: Cultists can no longer be chosen as a sacrifice target
2: Rune drawing is limited to one at a time (No spamming on one tile)
3: Removed some unneccesary `/improper`s from area names, for the cult Summoning locations
4: Changed a couple of colours to use defines

* QDELETED()

* Eye colour fix

* Reorganisation, Objectives, and Gender

The majority of the changes here are just reordering the procs, but there's a few fixes too:

1. Roundstart cultists now get given the 'servecult' objective.
2. Deconverting someone now removes their 'servecult' objective, so they won't be notified about target changes.
3. Stopped summoned ghosts from experiencing a spontaneous gender change.

* Screwdriver fix

* Prayer bead stripping

* Some more construct fixes

1: Fixed *all* holy constructs getting the 'Summon soulstone' ability
2: Fixed Wraiths getting their blue light reset to red after jaunting
3: Added a 'holy' variable to constructs, and made the holyification its own proc.

* qdeleted

* Construct Converting

Apparently you can convert holy constructs. Who knew!

* Another two weeks

Moved all the construct icon states to their own file, and fixed Nar'Sie constructs not getting a glowing effect.

* Grab fix

Fixed upgrading a grab having the ability to potentially transport the victim across dimensions.

* Not actually a cult fix but eh

Fixes: Runtime in outfit.dm, 114: bad number
And updates the cult corpse from legion spawns

* Teleport spell effect

Fixed the teleport effect for the spell being attached to the wrong mob.

* Small cleanup

* Eye colour cloning fix

* Veil Shifter

Fixed:
Runtime in cult_items.dm,355: pick() from empty list
Veil shifters not retaining any grabs after teleporting.

* Adjacent
 2021-05-16 11:33:07 +01:00
S34N
509c1d5638 Fixes rogue characters on strip menu (#16009) 2021-05-16 09:35:00 +01:00
Fox McCloud
89708fa00f Merge pull request #15549 from Kepplerx/Explosive-Implants-now-Always-available 
Explosive Implants now always possible to activate (Meant for Nukies especially)
 2021-05-15 11:01:02 -04:00
Fox McCloud
f76efc8f73 Merge pull request #15863 from ppi13/look-maa-i-can-fit-8-crayons-up-my-nose 
Adds the Elusive Black crayon
 2021-05-15 10:31:22 -04:00
Fox McCloud
83e4554c1a Merge pull request #15919 from AffectedArc07/rgb-floor-tiles 
RGB Light Tiles
 2021-05-15 10:29:47 -04:00
S34N
472a05efe9 Fixes infinite charge stunbaton and stunprod exploit (#16012) 
* Fixes infinite baton charge exploit

* moved it to the right proc
 2021-05-11 10:29:00 +01:00
S34N
60edf50279 fix da safe (#16001) 2021-05-07 23:59:46 +01:00
datlo
7aece0b03f Add a plain labcoat to chaplain locker (#15961) 2021-05-04 16:11:53 +01:00
SabreML
6481a50506 'Do Not Revive' verb for Ghosts (#15934) 
* DNR

* Review things

Bound to be something I missed, but testing all seems to work fine.

* Aliven't
 2021-05-02 15:42:56 +01:00
AffectedArc07
ebad914781 Update code/game/objects/items/stacks/tiles/tile_types.dm 
Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
 2021-04-25 16:17:39 +01:00
AffectedArc07
eddd9dda23 Update code/game/objects/items/stacks/tiles/tile_types.dm 
Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-04-20 22:47:35 +01:00
AffectedArc07
ca0b975440 RGB Light Tiles 2021-04-20 18:32:33 +01:00
SabreML
fb06547f97 Various bugfixes (#15873) 
* pAI Record Fix

* AI Respawnability

* Wine Reagents

* Ghost Repulsing

* Agent ID Card Numbers

* Maint Drone Lights

* Fix fixes

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

* Headpocket runtimes

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-04-19 14:50:30 +01:00
hal9000PR
6842d374c8 how did this make any sense? (#15904) 2021-04-18 11:38:39 +01:00
SabreML
0eaec89adb Soup Drinking (and custom soups!) (#15620) 
* SOUP

* Space stuff

it compiled before I swear

* =
 2021-04-15 22:04:24 +01:00
hal9000PR
0e1e728646 no more dismantling bike (#15892) 2021-04-15 21:57:55 +01:00
Sean Williams
df656ed43f Fixes surgical table moving anchored things (#15886) 
* stinky table no longer moves anchoreds

* Update code/game/objects/structures/tables_racks.dm

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-04-14 14:02:33 +01:00
LordShekelstein
1746aabba9 Adds an actual sprite for the singularity hammer. (#15806) 
* Fixes Gloves of the North Star exploit.

* Update miscellaneous.dm

* Update miscellaneous.dm

* Create miscellaneous.dm

* Update code/modules/clothing/gloves/miscellaneous.dm

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

* Update code/modules/clothing/gloves/miscellaneous.dm

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

* commit on 'master'

* commit on 'master'

* master

* 'singularityhammer'

* 'singularityhammer'

* singularityhammer

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-04-13 13:10:00 +01:00
ppi13
b97fedf863 Adds the Elusive Black crayon 2021-04-10 02:17:01 +02:00
Vi3trice
f0841b3629 Go away you heathen (#15737) 2021-04-07 19:27:51 +01:00
Adrer
31cda36233 Set multitool force to 0 (#15776) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2021-04-06 14:01:57 +01:00
Dennis
1ae84f79f2 Moved nullified to own proc and reduced stacking effect of nullrod/prayer beads (#15809) 
* Moved nullified to own proc and reduced stacking

* Fixed minor error.
 2021-04-06 13:58:36 +01:00
Kyep
46144e3c07 Syndie Space Base (#15104) 
* v1

* v2, floors

* more tweaks

* areas, powernet

* cleanup

* changed filename, added east wing, 6 slots

* syndi autolathe

* update ruins refs & config, delete comms agent

* IDs look properly syndie, names are randomized

* glass

* convert map file to TG map format

* del old file

* air alarms

* del navconsole, fix area tile

* AA request

* refactor

* AA requests II

* dorms symmetry

* deletes explosive plastitanium walls & self destruct device (from lavabase)

* add light to medical operating table

* atmos refill connectors

* add air canister and move meter in distro, add 2 portable air pumps

* improved vents

* tweaks pipes

* removes duplicate air alarm

* (PR req) replace areas/lathe/spawners with PR versions

* wrench, tele area icon, headset name

* player panel fix, replace /anyone ID with /researcher ID, ID.untrackable refactor

* fixes teleporter runtime

* "Syndicate Researcher" consistency

* cryo room

* delete syndiwrath

* default job on ID card for telecomms purposes

* add vents and airlocks

* air alarms toggle firelocks

* artvend

* trashbags

* revert alarm.dm

* delete rogue light

* update syndi lathe name, remove newscaster frame

* changes made necessary by atmos/redcross PRs

* fixes merge conflict

* update to fix conflicts with PR 15384 as well

* syndi teleporter now requires SYNDI_LEADER access, no more runtimes

* avoids making offstation cryopods always face right

* add scrubber net

* dmm2tgm

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2021-03-30 18:54:19 +01:00
Qwertytoforty
90d614653b Allows health scanners / ghosts to see cybernetic organs in health scan (#15705) 2021-03-30 12:10:10 +01:00
Qwertytoforty
2e4e0d2e91 Adds reactive teleport armor construction, ports repulsive armor from TG (#15343) 
* Adds reactive teleport armor construction, ports stuff from tg to do it

* Adds description to what disabled does in code

* Fixes ashwalker tendril anomaly

* SaberML code suggestions

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

* True or false

* Keeps reactive armors from triggering from kisses

* removes stun check

* oops

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

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-03-30 11:55:31 +01:00
Adrer
12551ab748 Sets flight to false if broomstick is dropped (#15764) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2021-03-29 20:07:23 +01:00
Ryal
5395eafda0 Fixes syntax issue (#15763) 2021-03-29 20:06:41 +01:00
Ryal
e7310cac9b Adds missing things to drone cleaning (#15553) 
* Adds missing things to drone cleaning.

* Update code/game/machinery/doors/airlock_electronics.dm

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

* Update code/game/machinery/doors/windowdoor.dm

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

* Update code/game/machinery/doors/airlock.dm

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

* Update code/game/machinery/doors/airlock.dm

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

* Moves destroyed electronics to emag_act

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-03-28 12:45:29 +01:00
Gatchapod
2ef3e3a07c Fixes one-handed plant-people (#15532) 
* Removes one-handed plant-people

* Unbreaking things

* Going too fast for my own good

* Alright, this time I actually checked all

* Let's just remove all unrelated changes

* mochi's suggestions

Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
 2021-03-28 12:42:50 +01:00
hal9000PR
3a85d81a3a drill goes brrrr (#15508) 2021-03-28 12:38:44 +01:00
datlo
ed326b7a21 Add sunglasses to Captain HOP and NT Rep lockers (#15418) 
* Add sunglasses to Captain and HOP lockers

* Add sunglasses to NT Rep Locker
 2021-03-28 12:34:02 +01:00
Sancronis
0a7adc58b0 Mobs are removed from closets first (#15658) 2021-03-28 12:11:03 +01:00
LightFire53
9a4f60524c Adjusts Cook Book (#15703) 
* Adjusts Cook Book

Brings the chef's cook book sprite more in line with the rest of the sprites.

* Update library.dmi

Extends meat further down the bone. Yummy.

* Last time, I swear

Using feedback from FalseIncarnate

* code parity

At the request of dearmochi
 2021-03-28 11:59:28 +01:00
hal9000PR
86ed653dd5 Adds the current mode of door remotes to the description (#15739) 
* changes things

* steel review

* forgot this
 2021-03-28 11:49:03 +01:00
SabreML
76e237edc5 Fixes HUD sunglasses deconstruction (#15444) 
* sunglasses

* Unit test test

* Unit test test tested
 2021-03-14 13:17:20 +00:00
Fox McCloud
9c425cbed3 Ports Slapping and Kissing (#15539) 
* Ports Slapping and Kissing

* forgot this

* table slapping
 2021-03-14 10:44:43 +00:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud
e79d3e45cf Merge pull request #15689 from Deelite34/fix_coordinates_logging 
Fix coordinates logging when new area is made, and excesive second pair of ? and FLW
 2021-03-08 16:26:02 -05:00
Deelite34
8015d59f82 Revert log_game change2 
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-03-08 19:45:01 +01:00
Deelite34
f7c5eb274a Revert log_game change 
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-03-08 19:44:45 +01:00
deelite34
7fe8e28fa8 Fix duplicate ? and FLW appearing 2021-03-08 16:51:24 +01:00
Fox McCloud
0dc46b7150 Merge pull request #15209 from SteelSlayer/spawn-removal 
Removes a bunch of spawn()'s
 2021-03-07 21:10:39 -05:00
Qwertytoforty
baca3707ea Adds the RD hardsuit from TG, removes war crimes (#15646) 
* let the pain begin

* Finishes drask sprites

* Apply suggestions from code review

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

* Grey, pixel fixes, steel fixes

* Skrell, taj, all that fun

* Skrek vulp, all my kin hate vulp

* nevermind vox are the worst, also adds unathi, and removes even more warcrimes ™️

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-03-07 18:05:41 +00:00
Fox McCloud
fdc6ab2211 Damns Devils Gamemode to Hell (#15672) 
* Damns Devils Gamemode to Hell

* Update config.txt
 2021-03-07 12:00:02 +00:00
Fox McCloud
156d360e57 TG Sprite Update Project: Toolboxes (#15663) 2021-03-05 17:33:29 +00:00
Deelite34
e8d2139b60 Fix crayon drawing invisible runes (#15673) 2021-03-05 14:19:45 +00:00
deelite34
cf693dde91 Fix coordinates not showing up in logs, when you create new area with station plans 2021-03-05 14:48:15 +01:00