Commit Graph

3357 Commits

Author SHA1 Message Date
warior4356
ba8052af3f Apply suggestions from code review
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-15 18:44:23 -07:00
warior4356
15b32b7283 Merge branch 'master' into holy-chapel 2021-07-05 18:12:02 -07:00
Fox McCloud
d9d09deb00 Merge pull request #16212 from AffectedArc07/atom-rotation
Better atom rotation
2021-07-01 22:15:58 -04:00
hal9000PR
dd9278ae98 bomb (#16273) 2021-06-30 22:47:01 +01:00
datlo
7de29bd81f Replace nukie jetpacks by oxygen tanks (#16101)
* Replace nukie jetpack by oxy tanks

* replace all harnesses
2021-06-29 11:46:43 +01:00
S34N
c1d19836e1 Adds warning to gluttony morph about not being an antag (#16148)
* chat message about not being an antag

* melts the snowflake

* forgot to do this

* Update code/datums/diseases/transformation.dm
2021-06-29 11:45:35 +01:00
warior4356
aec95fed48 Merge branch 'master' into holy-chapel 2021-06-28 20:31:34 -07:00
S34N
6080189ea3 Fixes powersink not giving you a beacon on purchase. (#16255)
* powersink gives you a beacon, as described

* no longer a bomb subtype

* Update code/game/objects/items/devices/radio/beacon.dm

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

* Update code/game/objects/items/devices/radio/beacon.dm

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

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-06-26 21:34:08 +01:00
AffectedArc07
9b86a42a3d Casing 2021-06-24 17:29:18 +01:00
S34N
6b06ca3ef5 Ports HTML manifest to TGUI (#16210)
* Ghost manifest is tgui now

* moved to tgui modules

* Delete crew_manifest.dm

* global

* ghost -> nologo

* sorry mr. tgui, i forgot about you again

* Jade review + more trimming

* lobby and silicons get some love

* bye bye, all traces of old manifest.

* renamed
2021-06-21 12:21:32 +01:00
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
S34N
265053f966 makes sol trader IDs properly update (#16137) 2021-06-08 15:05:00 +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
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
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
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
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
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
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
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
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
4052e2b49e Fixes Some Issues With Cybernetic Eyes (#15666) 2021-03-05 14:48:28 +00:00
Fox McCloud
926d484277 Moves External Organs to Nullspace (#15548)
* Moves External Organs to Nullspace

* additions

* oops

* further cleanup
2021-03-03 21:34:49 +00:00
Fox McCloud
75935ff876 Converts Eye Augments to Cybernetic Eyes (#15519)
* Converts Eye Augments to Cybernetic Eyes

* literally not used

* it helps when you properly include all the code

* flashlight eyes

* tweaks

* conflict resolution

* can't have two eyes

* order of operations matters here

* autosurgeon
2021-03-03 20:21:30 +00:00
Fox McCloud
7be1416ef0 Footstep Sound Overhaul (#15628)
* Footstep Sound Overhaul

* remove these

* tweaks
2021-03-02 10:01:57 +00:00
Fox McCloud
f65c8994ce Broad TG Sound Update (#15608)
* Broad TG Sound Update

* jester update
2021-02-27 11:59:33 +00:00
SteelSlayer
7390afb598 fox review 2021-02-26 23:02:17 -06:00
SteelSlayer
e57d867df5 spawn removals 2021-02-26 23:02:16 -06:00
Fox McCloud
b49a99d46e Ports Physiology (#15449)
* Ports Physiology

* updates
2021-02-26 18:33:28 +00:00
TDSSS
5f69256a66 I said NANOMACHINES, SON (#15541) 2021-02-25 15:59:00 +00:00
Fox McCloud
efa3aecb61 Ports TG Pickup, Equip, and Drop Sounds (#15572)
* Ports TG Pickup, Equip, and Drop Sounds

* really
2021-02-24 12:51:59 +00:00
Fox McCloud
78cb60f160 Fixes Some Sounds Having Reverb (#15602)
* Fixes Some Sounds Having Reverb

* typeless
2021-02-24 09:34:34 +00:00
Fox McCloud
64064019d8 Adds Sound Environments: Reverb and Echo (#15378) 2021-02-23 11:52:34 +00:00