Commit Graph

3675 Commits

Author SHA1 Message Date
SabreML
0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
shmabuu
d6e71523b1 No more CQC discount (#15920) 2021-06-17 10:41:39 +01:00
Cocacolagua
268f1cf833 jumpboots use the correct icon (#16181) 2021-06-15 12:56:23 +01:00
AffectedArc07
efed543f47 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-13 14:15:07 +01:00
S34NW
d5f3d55a94 Solgov is now ERT, also solgov SOO is now a thing. 2021-06-10 20:28:56 +01:00
AffectedArc07
def7a4ef52 Steel tweaks 2021-06-09 13:14:11 +01:00
S34N
265053f966 makes sol trader IDs properly update (#16137) 2021-06-08 15:05:00 +01:00
Sirryan2002
f451b84c07 Merge branch 'ParadiseSS13:master' into Despookify 2021-06-04 12:37:03 -04:00
AffectedArc07
f3c314f07b Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-03 18:10:19 +01:00
Leanfrog
f68220879d Adds A Nitrile Glove Crate To Cargo (#16011)
* glove crate blue

* 4 gloves over 3 as per Fox's request
2021-05-29 21:19:53 +01:00
SabreML
cd7017e1b3 Allows Maintenance Drones to see wire names (#16047)
* drone buff

* V2 (Item Trait)

* Indentation

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-05-29 21:19:05 +01:00
AffectedArc07
8fdf5960e4 DNM - Ref finder improvements 2021-05-25 11:00:13 +01:00
SabreML
4960f5440c Various Tweaks & Fixes (#15857)
* Stuff

* Grammar reviewer review

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>

* Shuttle call HTML fix

And multiline announcements too, à la #15645.

The clean_input() was causing the message to be encoded twice, and only decoded once. Removing it still encodes the string.

* Loadout revert

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
2021-05-24 16:29:07 +01:00
SteelSlayer
e4bbd94d6a Robot_module and cyborg stack refactor (#13527)
* robot_module refactor

* some fixes

1. adds medical stacks of 25 for the syndi medical borg
2. fixes various construction steps that weren't using `use()` or `get_amount()`

* review tweaks + other stuff

1. Makes a bunch of for loops into istypeless loops
2. Adds a readout of the current out of stacks a borg has, in the status panel
3. Slightly reorganizes the medical, syndi medical, engineering and syndi engineering cyborgs items

* fixes after upstream merge

* blank line for travis

* fixes and improvements

1. Fixed welder icon's not updating periodically if you were charging in a borg recharger
2. Fixes solar panels dropping /cyborg type glass when they were deconstructed.
3. Band-aid fix (incase #2 doesn't fix this) for cyborg stack's `source` var being null which resulted in tons of "cannot read null.energy" runtimes

* more fixes + constructable frame runtime fix

* removes toy sword placeholder

remove comment

* remove these as well

* .amount to .get_amount(), really should have done this before

* refactors robot_upgrades to work with the new system

- more cleanup
- adds documentation
- fixed a bug I made where you could delete your robot stack via crafting

* moves some unemag logic to the module file, makes more loops typless

* farie review

* fox review

* affected review and more TM bugfixes

* fixes comment

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2021-05-24 16:24:25 +01:00
AffectedArc07
968d1bc88d Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-05-24 15:30:20 +01:00
AffectedArc07
7486d026b7 READY 2021-05-23 17:26:17 +01:00
S34N
365fc87dbf Fixes a bug with solgov beret sprite (#16040)
* fix 1

* also catches a bug with TSF rep sechud icons
2021-05-17 12:51:15 +01:00
AffectedArc07
8dd5dfbf7f URL configuration 2021-05-16 21:14:10 +01:00
AffectedArc07
c7fd6681a1 Gamemode configuration 2021-05-16 15:15:05 +01:00
AffectedArc07
f728993007 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-05-16 13:22:14 +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
AffectedArc07
cb90c41034 Actually just do this 2021-05-15 21:07:31 +01:00
AffectedArc07
cc3d81df96 Server Update Update 2021-05-15 20:28:08 +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
hal9000PR
795b941ba3 Review stuff
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
2021-05-14 22:40:03 +01:00
AffectedArc07
4f80acc360 Ruins configuration 2021-05-03 19:56:41 +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
e2bd977238 couple fixes, spellings, styling changes. 2021-04-14 21:31:12 +01:00
dearmochi
71ddf21925 Adds volume channel for engine ambience (SM, Tesla) (#15845) 2021-04-10 12:10:22 +01:00
warriorstar-orion
ea38c69633 Support 28 additional hats for corgis. (#15669)
- /obj/item/clothing/head/HoS
- /obj/item/clothing/head/HoS/beret
- /obj/item/clothing/head/beret/sec
- /obj/item/clothing/head/bowlerhat
- /obj/item/clothing/head/caphat/parade
- /obj/item/clothing/head/hardhat/dblue
- /obj/item/clothing/head/hardhat/orange
- /obj/item/clothing/head/hardhat/red
- /obj/item/clothing/head/helmet/roman
- /obj/item/clothing/head/justice_wig
- /obj/item/clothing/head/soft/black
- /obj/item/clothing/head/soft/blue
- /obj/item/clothing/head/soft/green
- /obj/item/clothing/head/soft/grey
- /obj/item/clothing/head/soft/mime
- /obj/item/clothing/head/soft/purple
- /obj/item/clothing/head/soft/rainbow
- /obj/item/clothing/head/soft/red
- /obj/item/clothing/head/soft/sec
- /obj/item/clothing/head/soft/yellow
- /obj/item/clothing/head/surgery/black
- /obj/item/clothing/head/surgery/blue
- /obj/item/clothing/head/surgery/green
- /obj/item/clothing/head/surgery/purple
- /obj/item/clothing/head/wizard/black
- /obj/item/clothing/head/wizard/magus
- /obj/item/clothing/head/wizard/marisa
- /obj/item/reagent_containers/glass/bucket
2021-04-05 17:44:51 +01:00
warior4356
22374acfb4 Changing var name 2021-04-01 01:33:42 -07:00
hal9000PR
62845c01c3 Merge branch 'TG-carp' into TG-carp-2-electric-boogaloo 2021-03-31 16:48:48 +01:00
Adrer
43104f8826 Charge check in area teleport to FALSE (#15775)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2021-03-31 15:40:53 +01:00
Sirryan2002
f80e50588e Merge branch 'Despookify' of https://github.com/Sirryan2002/Paradise into Despookify 2021-03-30 16:14:02 -04:00
Sirryan2002
a94c650021 actually makes this fix work as intented 2021-03-30 16:13:27 -04:00
Sirryan2002
e37825f99a Update code/datums/spell.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-03-30 16:08:19 -04:00
Sirryan2002
97f56a1c65 bugfixing my code 2021-03-30 16:06:49 -04:00
Sirryan2002
efe5b709b0 Squashing cast/refund bug
adds a new bool var and a 1 second timer to ensure that refund_cast doesnt fire if the spell was actually cast correctly.
2021-03-30 15:26:24 -04: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
SabreML
504aba7ce0 Fixes species without hair losing their hairstyle to radiation (#15501)
* Hairloss V1

* Unathi revert
2021-03-30 11:51:16 +01:00
hal9000PR
8ab846f3e9 Adds combat gloves plus, gives them to nukies. (#15640)
* glove

* warning about not working with CQC

* review

* >:C
2021-03-28 12:50:41 +01:00
warior4356
d53d351b64 Initial commit 2021-03-26 02:31:21 -07:00
hal9000PR
6232f9e196 Nerfs drake form. (#15235) 2021-03-14 10:27:20 +00:00
Fox McCloud
02a157621d Updates Status Effects (#15581) 2021-03-11 19:22:04 +00:00
Fox McCloud
35824b4e94 Merge remote-tracking branch 'upstream/master' into his-grace-ascended 2021-03-11 14:12:01 -05:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00: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
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
118e73966f Implements Better His Grace 2021-03-05 13:51:17 -05:00