Commit Graph
21486 Commits
Author SHA1 Message Date
kevinz000andGitHub 9db94f7c29 Merge pull request #8691 from Ghommie/Ghommie-cit68
Ports in beekini and bee socks.
2019-06-23 06:41:34 -07:00
CitadelStationBot 6d42fab676 Automatic changelog generation for PR #8698 [ci skip] 2019-06-23 08:41:05 -05:00
kevinz000andGitHub 228df53c99 Merge pull request #8698 from Ghommie/Ghommie-cit72
Fixes "Penlights Cannot Give Eye Exams"
2019-06-23 06:41:03 -07:00
BlackMajorandGitHub d6a31efaa2 Merge pull request #8684 from Citadel-Station-13/kevinz000-patch-5
fixes piggybacking being delayless
2019-06-24 01:31:40 +12:00
kevinz000andGitHub e7331b3c98 Merge pull request #8571 from Thalpy/Dwarf
Medical smartdarts.
2019-06-23 06:24:10 -07:00
CitadelStationBot 573de725bc Automatic changelog generation for PR #8677 [ci skip] 2019-06-23 08:21:00 -05:00
kevinz000andGitHub 6f2fbd8577 Merge pull request #8677 from Trilbyspaceclone/patch-182
buffs speedy step quirk by a half
2019-06-23 06:20:58 -07:00
CitadelStationBot 21e757b69d Automatic changelog generation for PR #8665 [ci skip] 2019-06-23 08:19:43 -05:00
kevinz000andGitHub fc5eb0c9d5 Merge pull request #8665 from Ghommie/Ghommie-cit59
Buffs out certain stun spells.
2019-06-23 06:19:41 -07:00
kevinz000andGitHub 90564c714d Merge pull request #8710 from Arturlang/Nanite_Fixes
Fixes some nanite runtimes, and exploits
2019-06-23 06:08:36 -07:00
kevinz000andGitHub f34d850d77 Merge pull request #8716 from Sishen1542/pubbyfix
Replaces medical protolathe with medical techfab on Pubbystation.
2019-06-23 06:08:00 -07:00
CitadelStationBot 60d42511df Automatic changelog generation for PR #8718 [ci skip] 2019-06-23 08:01:54 -05:00
kevinz000andGitHub c48488f97f Merge pull request #8718 from Linzolle/ctrlsuit
allows quick maxing of suit sensors
2019-06-23 06:01:52 -07:00
CitadelStationBot 057e12dcf6 Automatic changelog generation for PR #8732 [ci skip] 2019-06-23 08:01:30 -05:00
kevinz000andGitHub b7ab8880d6 Ports in "makes the abductor console use radials" (#8732)
* Ports in "makes the abductor console use radials"

* indention bested me.
2019-06-23 06:01:28 -07:00
CitadelStationBot 37e97510e3 Automatic changelog generation for PR #8733 [ci skip] 2019-06-23 08:01:11 -05:00
Ghomandkevinz000 d4a13077ff ports in "Adds radial menu to arm-mounted implants" (#8733) 2019-06-23 06:01:09 -07:00
CitadelStationBot 36c1e80fcc Automatic changelog generation for PR #8669 [ci skip] 2019-06-23 08:00:29 -05:00
Ghomandkevinz000 41bd3caf3c Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669)
* Ports "Reorganizes the uplink, adds grenades and explosives category."

* Unbent codex, singing the sorrow of aborted spoils.

* .
2019-06-23 06:00:27 -07:00
Sishen1542andkevinz000 2bb56a900a Dab emote now checks restraint flags. (#8672)
* Update cit_emotes.dm

* Revert "Update cit_emotes.dm"

This reverts commit 649007667db6f7d1fdd0f30e99bbaa268fbeb03c.

* Revert "Revert "Update cit_emotes.dm""

This reverts commit 7950f642bf32b4179d265fdb498451c3e05a10fe.
2019-06-23 06:00:07 -07:00
CitadelStationBot 27920454de Automatic changelog generation for PR #8671 [ci skip] 2019-06-23 07:59:52 -05:00
Ghomandkevinz000 d21e483abf Ports "Disembowelment now only works if you are dead/in critical" (#8671) 2019-06-23 05:59:50 -07:00
CitadelStationBot 8c3d377a9b Automatic changelog generation for PR #8675 [ci skip] 2019-06-23 07:59:36 -05:00
Trilbyspacecloneandkevinz000 d85a2f5f4a Update arcade.dm (#8675) 2019-06-23 05:59:35 -07:00
CitadelStationBot 69e551a95f Automatic changelog generation for PR #8674 [ci skip] 2019-06-23 07:59:21 -05:00
Trilbyspacecloneandkevinz000 51e4ac0f67 fixes plant disk design and hacked autolathen (#8674)
* fixes plant disk design and hacked autolathen

* Update lavaland_surface_seed_vault.dmm
2019-06-23 05:59:19 -07:00
Ghommie d1008122da indention bested me. 2019-06-23 06:33:27 +02:00
Ghommie 41c0586154 Ports in "makes the abductor console use radials" 2019-06-23 06:28:37 +02:00
Linzolle 846f6789da suggested changes 2019-06-22 11:05:34 -05:00
Linzolle 6709483aec allows quick maxing of suit sensors 2019-06-21 23:06:53 -05:00
CitadelStationBot 2f96e40120 Automatic changelog generation for PR #8690 [ci skip] 2019-06-21 21:33:37 -05:00
Thalpyandkevinz000 498c35b733 Fixes empathy antag check exploit. (#8690)
* Fixes exploit

* Wrong way round..!

* Should be okay for antags now.

* Fixed githuba being dumb
2019-06-21 19:33:34 -07:00
88dd4bdc99 Brings back Big Wolf ears for humans (#8668)
* Brings back Big Wolf ears for humans

This use to be here, and I'm no furry, but it needed to come back.

* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>

* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>

* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>

* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-06-21 19:32:21 -07:00
Sishen 054ec6e710 Update PubbyStation.dmm 2019-06-21 21:38:53 -04:00
Arturlang 8be06ddcd0 Fixes 2019-06-21 17:27:57 +03:00
deathride58andGitHub 540fa77795 Merge pull request #8702 from Citadel-Station-13/commjacketfix
Fixes jacket dir
2019-06-20 18:12:19 -04:00
Jay f35eb97522 Fixes jacket dir 2019-06-20 02:19:34 -05:00
Fermi 88ec4e336e Small oops. 2019-06-20 03:34:49 +01:00
Ghommie 44a9fe9521 Fixes "Penlights Cannot Give Eye Exams" 2019-06-19 13:38:59 +02:00
Fermi e0cada7965 Quick fix for a runtime 2019-06-19 01:08:23 +01:00
Fermi fec1df2098 Rephrasal for understanding. 2019-06-19 00:52:45 +01:00
Fermi 095ea1243b Fits better. 2019-06-19 00:39:38 +01:00
Ghommie db3d5848c2 Ports in beekini and bee socks. 2019-06-19 01:28:47 +02:00
Fermi 724ec93166 oops 2019-06-19 00:24:02 +01:00
Fermi f5c98f5d57 Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf 2019-06-19 00:17:30 +01:00
Fermi fe6296b58a Added crafting recipies as per Bhijin's request. 2019-06-19 00:17:18 +01:00
kevinz000andGitHub 634f11d60d Update human.dm 2019-06-18 02:34:05 -07:00
Ghommie 4797a306cc applying suggestions. 2019-06-17 22:04:34 +02:00
TrilbyspacecloneandGitHub 4e1ac41393 Update species.dm 2019-06-17 14:41:06 -04:00
CitadelStationBot 601db5ff51 Automatic changelog generation for PR #8602 [ci skip] 2019-06-17 13:20:28 -05:00