Commit Graph

16502 Commits

Author SHA1 Message Date
Fermi c5e6cb8ac0 space 2019-11-26 04:08:10 +00:00
Fermi 69e0f6836a Adds a lil message so people don't spend 25 minutes trying everything 2019-11-26 04:05:43 +00:00
Fermi 79a64d9c63 Makes synthtissue a lil easier. 2019-11-25 03:36:39 +00:00
Fermi 399986f3f7 Forgot to update the procs 2019-11-22 23:57:09 +00:00
Fermi 7bbc90d747 makes the freezing list a typecache 2019-11-22 23:56:05 +00:00
Thalpy 9af48caa62 OKAY DONE ARGH 2019-11-21 20:46:00 +00:00
Thalpy 7b17bf2acd god damn bitflags ARGH 2019-11-21 20:30:49 +00:00
Thalpy db74091dd4 Strange revert 2019-11-21 19:47:00 +00:00
Thalpy 7460c28b60 Merge branch 'OrganQoL' of https://github.com/Thalpy/Citadel-Station-13 into OrganQoL 2019-11-21 19:39:58 +00:00
Thalpy 0cce3a01f4 Ghommie's requiem 2019-11-21 19:39:55 +00:00
Thalpy a0a52018f3 Apply suggestions from code review
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-11-21 19:06:34 +00:00
Thalpy da1da717d2 Update code/game/objects/items/devices/scanners.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-11-21 19:03:48 +00:00
Thalpy bd07ff4bf7 This should be the one! 2019-11-21 18:55:43 +00:00
Thalpy 00bffba7ea Why do surgeries always end up with jank 2019-11-21 15:57:21 +00:00
Thalpy 46076c95c7 Ghommie is a good friend 2019-11-21 14:22:04 +00:00
Thalpy 8256a206cf Update code/modules/surgery/emergency_cardioversion_recovery.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-11-21 13:24:57 +00:00
Fermi b911fabb37 Okay bedtime 2019-11-21 04:25:25 +00:00
Fermi b90213882e Again with the rouge 2019-11-21 03:58:16 +00:00
Fermi 01f465dc8c Scanner formatting 2019-11-21 03:52:00 +00:00
Fermi 18e1246fd0 Classic fixes 2019-11-21 03:16:18 +00:00
Fermi cc53a0061f Well it compiles 2019-11-21 02:15:58 +00:00
kevinz000 20bcca0398 Merge pull request #9852 from Ghommie/Ghommie-cit369
Fixing some wizard den teleportation issues.
2019-11-19 21:39:20 -07:00
kevinz000 34a8dc5962 Merge pull request #9850 from Ghommie/Ghommie-cit368
fixing a few minor issues with console frames building.
2019-11-19 21:38:58 -07:00
kevinz000 7503366524 Merge pull request #9853 from Ghommie/Ghommie-cit370
Adds a few extra cardboard cutout variants.
2019-11-19 21:38:32 -07:00
kevinz000 67abc4ff03 Merge pull request #9855 from Ghommie/Ghommie-cit371
Fixing suit store overlays
2019-11-19 21:38:22 -07:00
kevinz000 c1a416e257 Merge pull request #9858 from Ghommie/Ghommie-cit372
Fixing gasping xenos.
2019-11-19 21:37:17 -07:00
kevinz000 779fac99b4 Merge pull request #9829 from Ghommie/Ghommie-cit361
Unborking id consoles.
2019-11-19 21:33:14 -07:00
kevinz000 d692d3fe01 Merge pull request #9835 from Ghommie/Ghommie-cit363
Ports "Self sustaining fix"
2019-11-19 21:32:57 -07:00
kevinz000 755559bb66 Merge pull request #9836 from Ghommie/Ghommie-cit364
Ports "Uses defines for turf atmos"
2019-11-19 21:32:42 -07:00
kevinz000 a012347c52 Merge pull request #9837 from Ghommie/Ghommie-cit365
Ports "Fixes an Ancient LINDA Bug"
2019-11-19 21:32:23 -07:00
kevinz000 6bee2721cc Merge pull request #9838 from Ghommie/Ghommie-cit366
Ports "restores legacy sends to SSChat"
2019-11-19 21:32:05 -07:00
kevinz000 9e5f697838 Merge pull request #9842 from NopemanMcHalt/dab-op-plus
Fixes D.A.B. loadout name
2019-11-19 21:31:47 -07:00
kevinz000 c7765a032b Merge pull request #9844 from Putnam3145/dynamic-midround-wizard-tweak
Dynamic summon events tweaks
2019-11-19 21:31:14 -07:00
kevinz000 56413c1460 Merge pull request #9846 from KathrinBailey/IKEA-station-13
IKEA Station 13: Import TG's Pews
2019-11-19 21:30:56 -07:00
kevinz000 4d1a9a0773 Merge pull request #9816 from Ghommie/Ghommie-cit356
Ports "Fixes MMIs not being able to use mecha equipment"
2019-11-19 21:30:13 -07:00
kevinz000 a2f85cd19d Merge pull request #9819 from Ghommie/Ghommie-cit358
Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor.
2019-11-19 21:29:30 -07:00
kevinz000 877b79ae1c Merge pull request #9822 from Putnam3145/dynamic-wizard-rework
Reworked how wizard spells interact with dynamic
2019-11-19 21:29:09 -07:00
kevinz000 63899bdc3d Merge pull request #9827 from Ghommie/Ghommie-cit360
one line shuttle fix port
2019-11-19 21:28:50 -07:00
kevinz000 f883f55391 Merge pull request #9818 from GrayRachnid/portssaboteur
Ports the Saboteur borg for nukeops and new cyborg tools/weapon icons.
2019-11-19 21:28:25 -07:00
deathride58 cb70f47a48 Merge pull request #9814 from Citadel-Station-13/kevinz000-patch-115
modifies donator config entry to allow multiple ckeys per line
2019-11-19 13:38:20 -05:00
kevinz000 2494ea4d07 Merge pull request #9824 from YakumoChen/YakumoChen-mariplush
Adds Marisa plushie
2019-11-19 01:55:59 -07:00
kevinz000 40a01dedfe Merge pull request #9806 from BlackMajor/Yote
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
2019-11-19 01:54:47 -07:00
BlackMajor 6cdb54bef1 Fix service borg lights breaking 2019-11-19 21:29:05 +13:00
kevinz000 84e84355c3 Update code/controllers/configuration/config_entry.dm
Co-Authored-By: Lin <linzolle@gmail.com>
2019-11-19 01:07:43 -07:00
BlackMajor 31c59b7cad fixes upgrades removing dogborg stuff 2019-11-19 20:50:59 +13:00
Lin c188c20f37 Merge pull request #9802 from Ghommie/Ghommie-cit349
Unmodularize bikehorns and holy weapons.
2019-11-19 03:24:38 +00:00
Lin 512939f1e6 Merge pull request #9730 from Citadel-Station-13/kevinz000-patch-112
kinetic crushers no longer drop if you try to use it with one hand
2019-11-19 03:23:12 +00:00
Ghommie 63a3919ed2 Fixing gasping xenos. 2019-11-18 20:58:22 +01:00
Ghommie 21c1f8bc2a Fixing suit store overlays 2019-11-18 15:19:39 +01:00
Ghommie 86072fe682 " 2019-11-18 04:15:33 +01:00