Commit Graph
4623 Commits
Author SHA1 Message Date
E-MonaRhg abef5e648f Missing space begone 2021-04-17 22:56:23 +02:00
AffectedArc07 2d876bd530 New ID card sprites 2021-04-17 15:17:50 +01:00
E-MonaRhg 79512e1f72 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-04-14 20:41:45 +02:00
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
E-MonaRhg dcee2ee440 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-04-06 15:28:01 +02:00
DennisandGitHub 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
E-MonaRhg 4c96040791 Grammar and flavor stuff 2021-04-06 02:48:35 +02:00
E-MonaRhg c76cc81321 Fixed what was broken 2021-03-31 22:57:47 +02:00
E-MonaRhg 7b342f4476 Hey, that compact defib thing is pretty cool, what if we had three? 2021-03-31 22:34:17 +02:00
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
AdrerGitHubadrermail@gmail.com <adrermail@gmail.com>
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
RyalandGitHub 5395eafda0 Fixes syntax issue (#15763) 2021-03-29 20:06:41 +01:00
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
LightFire53andGitHub 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
SabreMLandGitHub 76e237edc5 Fixes HUD sunglasses deconstruction (#15444)
* sunglasses

* Unit test test

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

* forgot this

* table slapping
2021-03-14 10:44:43 +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 McCloudandGitHub fdc6ab2211 Damns Devils Gamemode to Hell (#15672)
* Damns Devils Gamemode to Hell

* Update config.txt
2021-03-07 12:00:02 +00:00
Qwertytoforty 0789cfd3fe Updates to latest, so I can deconflict 2021-03-05 14:06:46 -05:00
Fox McCloud 118e73966f Implements Better His Grace 2021-03-05 13:51:17 -05:00
Fox McCloudandGitHub 156d360e57 TG Sprite Update Project: Toolboxes (#15663) 2021-03-05 17:33:29 +00:00
Qwertytoforty 88d876d3dc the rest of the fucking owl. Adds nuke core objective, fixes 2021-03-04 13:55:05 -05:00
Fox McCloudandGitHub 091146029a No, Mobs Are Not Lockboxes (#15657) 2021-03-03 22:05:54 +00:00
Qwertytoforty 506f980d3d Adds supermatter sliver steal objective from TG 2021-03-03 16:33:48 -05:00
Fox McCloudandGitHub 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 McCloudandGitHub dcace52184 Makes the Clown All Powerful (#15612)
* Makes the Clown All Powerful

* sadtrombone.ogg
2021-03-02 16:16:47 +00:00
3ae6ef1fc2 Initialized Storage Items (#15057)
* Refactor V1

* And this too

Three commits already

* Review stuff

* hecking invisible runtimes

* Cleanup and Documentation

This part is NOT intended to be a refactor.
I just figured why not go through everything since I'm already messing with it.

* Hopefully got all of the . = ..()

Also fixed a massive bug that I somehow didn't notice.

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

* for() loops

Pretty sure I got everything.
Cutoff point is 4 items.

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-02-28 21:45:24 +00:00
Fox McCloudandGitHub f65c8994ce Broad TG Sound Update (#15608)
* Broad TG Sound Update

* jester update
2021-02-27 11:59:33 +00:00
Fox McCloudandGitHub c73cc5aa68 Refactors Organ Shocking To Use Signals (#15593)
* Refactors Organ Shocking To Use Signals

* proper source

* hush you
2021-02-26 18:43:11 +00:00
Fox McCloudandGitHub 20485c029b Pickup and Dropped Bugfixing (#15575) 2021-02-24 19:23:31 +00:00
Fox McCloudandGitHub 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 McCloudandGitHub 78cb60f160 Fixes Some Sounds Having Reverb (#15602)
* Fixes Some Sounds Having Reverb

* typeless
2021-02-24 09:34:34 +00:00
SabreML 6a100c4889 Swatting 2021-02-23 22:31:58 +00:00
SabreML e30fb16180 Turf 2021-02-23 20:26:51 +00:00
SabreML 020e48f519 B 2021-02-23 20:00:52 +00:00
SabreMLandGitHub 27a7eeee8b Stunbaton Refactor (#15313)
* Baton refactor V1

* Var name

* Stunbatons 1.2

update_icon() and examine() just got moved, no changes to them.
2021-02-22 09:13:46 +00:00
dearmochiandGitHub 196b23d3d5 Fixes some overlay screwery on death and revival (#15192)
* Toggles fullscreens off/on on death/revival instead of deleting them

Fixes a lot of issues regarding fullscreens (vulpkanin NV/welding shield
overlay vanishing, crit overlay not persisting on defib)

* Restores blind effect when defibrillated back to life

Fixes issue where the blind overlay wouldn't appear
when defibrillated, even though the patient is
unconscious/blind
2021-02-21 21:45:32 +00:00
Fox McCloudandGitHub 02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483)
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
2021-02-21 21:25:19 +00:00
Kepplerx 3a07d1c0f6 Update implant_explosive.dm 2021-02-19 16:41:24 +01:00
Kepplerx 1de48ea7ca Activatable always 2021-02-17 17:37:56 +01:00
Fox McCloudandGitHub 5211cfe8a9 Transitions to Full-tile Windows (#15385)
* Transitions to Full-tile Windows

* tweaks

* bump fix and RCD inclusion

* no colors

* debris refactor

* even better
2021-02-02 20:50:47 +00:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Fox McCloudandGitHub 003a1f7cba Tank Refactor; Breathing Retool (#15371)
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
2021-01-28 20:57:37 +00:00
Fox McCloudandGitHub fc128af66c Fixes Cigarettes rendering on mob when on the ears (#15363) 2021-01-28 18:46:19 +00:00
Fox McCloudandGitHub de795c4e31 Radiation Refactor (#15331)
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
2021-01-24 22:03:13 +00:00
SabreMLandGitHub a8b7888ae9 Cable Retracting (#15285) 2021-01-24 13:39:08 +00:00
SabreMLandGitHub 5aeede675b Fixes one handed dswords (#15289)
* One handed deswords

* Reverts unintended changes

Got a bit confused, I need more coffee
2021-01-20 09:54:26 +00:00
dearmochiandGitHub cc6c6d0389 Adds ability to color patch packs in ChemMaster (#15244) 2021-01-10 20:56:37 +00:00