Commit Graph

960 Commits

Author SHA1 Message Date
Sishen
b98a5016b3 aaaaaaaaaaaa 2019-08-29 01:56:52 -04:00
kevinz000
a845b5ae0c Merge pull request #8986 from Ghommie/Ghommie-cit163
reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code.
2019-08-07 00:49:23 -07:00
kevinz000
eab07c62de Merge pull request #9045 from CameronWoof/codifying-mrp-again
Officially ends the non-stop thrill ride of coating the station in your gender fluids for "fun"
2019-08-05 14:57:54 -07:00
Cameron!
33d883367a makes fluid_rate match the intended rate 2019-08-05 06:41:57 -07:00
kevinz000
f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
kevinz000
de675a10e7 Merge pull request #9025 from Poojawa/patch-1
Actually fixes Vore sounds for real this time
2019-08-04 19:08:16 -07:00
kevinz000
27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
CameronWoof
900d8d00af Officially ends the non-stop thrill ride of coating the station in your various fluids for "fun" 2019-08-03 20:37:02 -07:00
kevinz000
a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
2019-08-02 00:57:05 -07:00
Poojawa
dc3f178e65 Improves vore sound efficency
Also ghosts won't be able to hear any sounds or see any messages at all anymore.
2019-07-31 22:12:08 -05:00
Poojawa
8c24cb519b Likely fixes vore sounds
Bhjin man bad
2019-07-31 18:30:57 -05:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
kevinz000
a0cf508d99 Merge pull request #8959 from Trilbyspaceclone/patch-196
Ports "Anti-magic items now work properly in the suit storage slot #45333"
2019-07-29 04:41:55 -07:00
kevinz000
32e8bfbea1 Merge pull request #8979 from Ghommie/Ghommie-cit158
Fixes CHECK_BITFIELD macro.
2019-07-29 04:33:21 -07:00
TrilbySpaceClone
7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
Ghommie
78e4c8689b reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code. 2019-07-28 01:04:19 +02:00
Ghommie
c7e396696e Fixes CHECK_BITFIELD macro. 2019-07-27 02:47:46 +02:00
kevinz000
f50e46719b Merge pull request #8962 from Poojawa/edgecase-hud
Fixes literally 1% of user complaints with one number
2019-07-26 09:15:55 -07:00
Poojawa
40b2061ee1 Fixes literally 1% of user complaints with one number 2019-07-25 02:39:22 -05:00
Trilbyspaceclone
f10797185d Update inventory.dm 2019-07-24 17:02:20 -04:00
kevinz000
c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149
Towels.
2019-07-20 12:06:54 -07:00
kevinz000
08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114
Ports the toggleable dark mode to the game!
2019-07-20 11:57:13 -07:00
Ghommie
4e6554076c item flags, not clothing flags. 2019-07-18 00:16:14 +02:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Ghommie
ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
kevinz000
2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
kevinz000
a573689101 Merge pull request #8887 from Poojawa/last-word-hearing-psychics
Gang victory news report and last words for discord bot
2019-07-14 14:04:20 -07:00
Poojawa
245bd3e650 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into last-word-hearing-psychics 2019-07-13 10:18:13 -05:00
Poojawa
4d895ae6c0 Gang victory news report and last words for discord bot
also slight improvement to gangster greetings
2019-07-13 08:38:19 -05:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
8f410429de Ports "Renames SSsqueak to SSminor_mapping" 2019-07-13 07:08:03 +02:00
kevinz000
13b1e5d409 Merge pull request #8812 from Sishen1542/surgery-hugboxing
Using the wrong tool during surgery won't hit the patient with it. Also stops medical borgs from attacking with surgical tools outside of harm intent.
2019-07-12 07:42:11 -07:00
kevinz000
1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-12 07:34:19 -07:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
deathride58
b8e34d1cab Merge pull request #8704 from Citadel-Station-13/kevinz000-patch-12
[s] RCD logging
2019-07-08 18:07:27 -04:00
Ghommie
d14b18f89a I hate byond dmf editor what the $&@* 2019-07-06 03:17:20 +02:00
Ghommie
44390e00e4 ok 2019-07-06 02:03:21 +02:00
Ghommie
03315d1cbb Ports a toggleable darkmode to the game! 2019-07-05 22:29:50 +02:00
kevinz000
bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-07-03 13:47:04 -07:00
Ghommie
1fd50cc15a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96 2019-07-03 04:52:57 +02:00
Sishen
67a602fd79 hugboxed surgery, works for borgs 2019-07-02 06:26:07 -04:00
Ghommie
ad3b709c40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97 2019-06-29 06:39:21 +02:00
Ghommie
0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
kevinz000
c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
2019-06-28 20:32:15 -07:00
kevinz000
7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42
[Ready]Reskinnable PDAs.
2019-06-28 20:30:05 -07:00
Ghommie
3291b9c47a Porting in donut fixes, beepsky smash and Neurotoxin reworks. 2019-06-28 23:17:12 +02:00
kevinz000
0c20dc6e72 Merge pull request #8706 from Sishen1542/thecargonianengineeralliance
Ports the ability to sell fusion gases & generate research points with fusion. Also adds atmos hardsuits purchasable through cargo.
2019-06-25 02:00:41 -07:00
Ghommie
67f00fc049 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42 2019-06-24 16:48:15 +02:00
kevinz000
05f304f9c0 Merge pull request #8692 from Ghommie/Ghommie-cit69
[s] Ports "Fixes PDA TK exploits" and "Fixes pride mirror exploit"
2019-06-23 06:56:17 -07:00
kevinz000
c9d67ecd49 Merge pull request #8667 from Ghommie/Ghommie-cit61
Ports the system for randomized semi-persistent chem reactions.
2019-06-23 06:54:43 -07:00