Commit Graph

14774 Commits

Author SHA1 Message Date
kevinz000 52ab6e557b fix 2020-06-12 17:00:01 -07:00
kevinz000 3cf14f4fad prettier 2020-06-12 16:48:22 -07:00
kevinz000 6cf18e1d49 why did i find replace 2020-06-12 16:38:28 -07:00
kevinz000 c7eead3f28 don't blind find/replace folks 2020-06-12 16:34:54 -07:00
kevinz000 146542b077 sdql2 2020-06-12 16:33:36 -07:00
kevinz000 00666422af fix 2020-06-12 15:47:46 -07:00
Timothy Teakettle a8de357342 more simplemobs including slimes fit in pet carriers (#12494)
* make slimes small

* cockroaches/crabs/sloths
2020-06-11 05:43:40 -07:00
Ghom 8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghom 6b4f7886e4 Merge pull request #12471 from Citadel-Station-13/poplock
poplocks hijack/glorious death
2020-06-09 17:02:32 +02:00
Timothy Teakettle 14c9ab2ff1 ports tgs regal rats (#12479)
* port regal rats

* fix missing line

* royal rat goes after humans too

* okay dont let them attack people

* let them attack people but at less damage

* remove header
2020-06-09 03:28:00 -07:00
Ghom 77a6511cc7 Fixing two issues. (#12481) 2020-06-09 03:26:19 -07:00
Trilbyspaceclone 81070b8ada New fermi chem Zeolites! (#12428)
* Zeolites!

* No loner hs debug numbers...
2020-06-09 03:25:40 -07:00
b1tt3r1n0 764ba26ace Pouches (#12432)
* The Ammo Pouch

It holds magazines and most forms of ammo.

* The Ammo Pouch

It holds magazines and most forms of ammo.
2020-06-09 03:22:39 -07:00
Timothy Teakettle 3692323615 plushmium: the fermichem that creates sentient plushies (#12450)
* create plushie mob and chem

* better plush

* sentience

* fixes

* more fixes

* spelling error

* okay this works better

* more work on sentiency

* fixes

* further fixes

* revert plush storage changes, add splash effect

* fix icons

* undo a change that i guess isnt needed

* remove spaces

* plushies are now space immune

* make warning text more clear

* dont give them more health than bears?

* give them 0/1 stamina damage

* bugfix

* squeak when attacked

* small refactor
2020-06-09 03:21:18 -07:00
kevinz000 139720e2ce Update code/modules/antagonists/traitor/classes/martyr.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-08 21:16:32 -07:00
kevinz000 3960050c71 Update code/modules/antagonists/traitor/classes/hijack.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-08 21:16:26 -07:00
Ghom 798de9baf1 Porting "Speeds up /datum/light_source/proc/update_corners() by 16% or so" (#12496) 2020-06-08 21:15:26 -07:00
Lin 52d6069e40 Merge pull request #12446 from kevinz000/hotkey_fixes
Adds modifier-independent hotkey bindings
2020-06-08 11:28:49 -05:00
NopemanMcHalt e5bc651140 Station has a crew loose (Adds Orville-inspired(?) uniform) (#12447)
* Station has a crew loose

Also adds paramedic to the MedSci Trekkie list
And allows chaplain to wear UniFed Service uniform

* hotfix for digi ops
2020-06-08 09:14:19 -07:00
DeltaFire15 efddaa8cad removes early return (#12483)
This early return, while skipping a few things, is a bad ideaas this pretty much allowed silicons to still interact with the station off-z as it 'skipped' the check for it.
2020-06-08 09:10:06 -07:00
Ghom 881dfe81c5 Merge pull request #12187 from Trilbyspaceclone/patch-373
Nerfs cargo gas selling - MK different pr then the one that addresses this
2020-06-08 08:21:07 +02:00
Trilbyspaceclone 6cf4985360 Update large_objects.dm 2020-06-08 01:09:27 -04:00
Trilbyspaceclone abaf633ab9 Update large_objects.dm 2020-06-08 01:09:06 -04:00
Ghom 8ba5c8f690 Merge pull request #12444 from shellspeed1/Makes-internal-tanks-printable
Makes internal tanks printable at the engineering lathe
2020-06-08 00:37:26 +02:00
Ghom 1f65381a09 Merge pull request #12463 from DeltaFire15/ling-specialrole-fuckery
Quick ling on_removal() fix
2020-06-08 00:35:45 +02:00
Ghom 231c11a6ad Merge pull request #12465 from Linzolle/shotgun-fix
shotguns no longer delete shells in their chamber after firing
2020-06-08 00:34:31 +02:00
Ghom 941525c74a Merge pull request #12462 from timothyteakettle/fix-kudzu
fixes spacevines
2020-06-08 00:33:51 +02:00
kevinz000 210c873fe6 Update martyr.dm 2020-06-07 02:12:28 -07:00
kevinz000 7b69daffd7 Update hijack.dm 2020-06-07 02:12:12 -07:00
kevinz000 35abf4ffc9 Update traitor_class.dm 2020-06-07 02:11:43 -07:00
kevinz000 eceb46d02b Update datum_traitor.dm 2020-06-07 02:10:28 -07:00
Linzolle fe6cf2dd44 ramsay broke every shotgun 2020-06-06 14:22:23 -05:00
DeltaFire 0cfbee9809 modifies keycard authentification devices
They now actually require an ID to authentificate instead of just 'access' to it.
Additionally, one can no longer initiate and confirm actions with the same ID.
2020-06-06 18:08:30 +02:00
DeltaFire fe39ffe033 quick oneline thing 2020-06-06 17:07:50 +02:00
Timothy Teakettle 994ab8ac16 fixes spacevines 2020-06-06 16:00:26 +01:00
kevinz000 0e2fb9801e woops 2020-06-05 00:59:18 -07:00
kevinz000 7891c77ea9 text2num 2020-06-05 00:41:48 -07:00
kevinz000 ee2a2ad017 fix 2020-06-05 00:24:01 -07:00
kevinz000 a2d131646f sigh 2020-06-05 00:01:02 -07:00
kevinz000 26b541dc42 css sucks 2020-06-04 23:41:40 -07:00
kevinz000 ee5b209932 eh 2020-06-04 23:27:50 -07:00
kevinz000 87dc0e0823 sigh 2020-06-04 23:22:17 -07:00
kevinz000 51a1eeb9de sigh 2020-06-04 23:18:31 -07:00
kevinz000 29302c51ed ok 2020-06-04 22:58:42 -07:00
shellspeed1 e80ec920e0 Moved the tanks to industrial tech node. 2020-06-04 16:42:10 -07:00
shellspeed1 2002a273de Makes empty internal tanks printable 2020-06-04 16:04:16 -07:00
Trilbyspaceclone 0b0e9011a7 Prevent surgery tools and items from being rad contaminatable (#12413)
* Update tools.dm

* Update tools.dm

* Update robot_modules.dm
2020-06-04 15:56:15 -07:00
Ghom d687a04507 Fixing stationary and instrument-less song datum UIs not updating. (#12425)
* Fixing stationary and instrument-less song datums not updating.

* I forgot this one.
2020-06-04 15:53:57 -07:00
Yawet330 fabfd684ce Silicon Flavortexts. (SCRUTINISE HEAVILY) (#12395)
* Part 1 - Adding the component

* Part 2 - Making the WRITE_FILE before changing the pref menu.

* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction

* Part 4 - Changes the preference tab to accomodate this.

* we made a brief fucky wucky!

* make it look noice

* fuckywucky mk2

* Part 5 - make it apart of the helper list (woops)

* that'yll do it.

* maybe fix?

* nope, just hit the delete button on their flavortext entirely :agony:

* Update preferences_savefile.dm

* Update silicon.dm

* Update preferences.dm

* Update silicon.dm
2020-06-04 15:53:39 -07:00
DeltaFire15 0dc57a5a96 Powers Reimagined : Void Volt (#12433)
* Void volt try 2 : Conflict boogaloo

This time with a new branch because >conflicts

* changes up some stuff

some modifications & fixes for void volt while also reorginasing the scripture tier scriptures a bit.

* Tweaks, fixes and changes

After a fuckton of localtesting, I changed around some values / fixed some stuff so it should be fine to have.

* haha yeah uh better not leave that one debug message in

oops!
2020-06-04 15:41:01 -07:00