Commit Graph

15183 Commits

Author SHA1 Message Date
kevinz000 cc51768223 Update emote.dm 2020-06-09 21:58:11 -07:00
kevinz000 1ca12319b2 Update say_vr.dm 2020-06-09 21:56:49 -07:00
deathride58 d4621bb704 corrects the date for lesbian visibility! 2020-06-09 20:55:22 -04:00
deathride58 d0ff964c28 Adds more LGBTQIA+-related holidays! 2020-06-09 20:19:52 -04:00
kevinz000 d9b3161775 Update emote.dm 2020-06-09 10:53:10 -07:00
kevinz000 e9a8daf805 Update say.dm 2020-06-09 10:45:52 -07:00
kevinz000 9523a3c1b3 Update say_vr.dm 2020-06-09 10:45:00 -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
kevinz000 e3487b2adf boy oh boy 2020-06-08 21:08:40 -07:00
Ghommie a323fe01d3 This should be fine now. 2020-06-08 20:22:16 +02:00
Ghommie c246e13693 Ok. 2020-06-08 19:15:51 +02: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
kevinz000 b3afed69f4 huffles 2020-06-08 08:47: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
Ghommie ad6b835e8b Linter. 2020-06-08 08:12:29 +02:00
Ghommie afff7472d6 ok 2020-06-08 07:39:48 +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
Ghommie 495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02: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
TheSpaghetti e4763b5f6e let's try that again
more insectoid insects
2020-06-07 18:12:49 -04: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