Seris02
|
cebf2d2de2
|
does putnam's suggestion
I edited this on a web browser so if it breaks blame putnam
|
2019-12-02 00:30:20 +08:00 |
|
Seris02
|
136698ce7d
|
Merge branch 'sleepingcarphallucination' of https://github.com/Seris02/Citadel-Station-13 into sleepingcarphallucination
|
2019-11-30 10:26:21 +08:00 |
|
Seris02
|
9788586bb2
|
fixes some things :hjonk:
|
2019-11-30 10:23:22 +08:00 |
|
Seris02
|
84c2b7cef6
|
Update code/modules/flufftext/Hallucination.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-11-30 10:02:23 +08:00 |
|
Seris02
|
a4fb86df48
|
forgot to add it to the list of hallucinations you can have
|
2019-11-30 01:00:23 +08:00 |
|
Seris02
|
1e8227346c
|
adds sleeping carp wrist wrench/violent grab hallucination
|
2019-11-30 00:50:27 +08:00 |
|
CitadelStationBot
|
63e96a1402
|
Automatic changelog generation for PR #9874 [ci skip]
|
2019-11-23 12:49:35 -06:00 |
|
kevinz000
|
f0996208a3
|
Merge pull request #9874 from Ghommie/Ghommie-cit379
Honkbot slip and slide fun ride.
|
2019-11-23 11:49:32 -07:00 |
|
CitadelStationBot
|
40d787133d
|
Automatic changelog generation for PR #9891 [ci skip]
|
2019-11-23 12:46:30 -06:00 |
|
kevinz000
|
aba39f0b36
|
Merge pull request #9891 from Putnam3145/dynamic-traitor-fix
[DYNAMIC] Reverted making latejoiners count for roundstart rulesets
|
2019-11-23 11:46:28 -07:00 |
|
CitadelStationBot
|
589055628a
|
Automatic changelog generation for PR #9881 [ci skip]
|
2019-11-23 12:46:00 -06:00 |
|
kevinz000
|
f28a6feb5f
|
Merge pull request #9881 from Putnam3145/persistent-dynamic-weights
Allows extended voting on dynamic if recent rounds too chaotic
|
2019-11-23 11:45:58 -07:00 |
|
kevinz000
|
be679b97a6
|
Merge pull request #9885 from Commandersand/cuckcult
Makes the brass skewer more ouchie than ouchie~
|
2019-11-23 11:45:24 -07:00 |
|
CitadelStationBot
|
0700b050e1
|
Automatic changelog generation for PR #9909 [ci skip]
|
2019-11-23 12:44:54 -06:00 |
|
kevinz000
|
f88ed98ee4
|
Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert
Anthromorphic Insect Revert
|
2019-11-23 11:44:52 -07:00 |
|
CitadelStationBot
|
6b19420a83
|
Automatic changelog generation for PR #9749 [ci skip]
|
2019-11-23 12:42:40 -06:00 |
|
kevinz000
|
75510d8da9
|
Merge pull request #9749 from Trilbyspaceclone/patch-238
What do you mean I cant hold the armory on my back? -BOH nerf
|
2019-11-23 11:42:37 -07:00 |
|
CitadelStationBot
|
c8235def34
|
Automatic changelog generation for PR #9864 [ci skip]
|
2019-11-23 12:39:38 -06:00 |
|
kevinz000
|
88762c5d89
|
Merge pull request #9864 from Knouli/Legioncore-Use-In-Hand
Able to use Legion Cores in-hand
|
2019-11-23 11:39:35 -07:00 |
|
CitadelStationBot
|
c8fe354e91
|
Automatic changelog generation for PR #9898 [ci skip]
|
2019-11-22 23:52:46 -06:00 |
|
Lin
|
e954cec58c
|
Merge pull request #9898 from Ghommie/Ghommie-cit387
Dreamchecker compatibility changes, part 3.
|
2019-11-23 05:52:44 +00:00 |
|
CitadelStationBot
|
88d126794c
|
Automatic changelog generation for PR #9896 [ci skip]
|
2019-11-22 23:52:13 -06:00 |
|
Lin
|
592dcdb6fd
|
Merge pull request #9896 from Ghommie/Ghommie-cit386
Fixing cyborg camera interaction for real
|
2019-11-23 05:52:11 +00:00 |
|
Lin
|
028fa518e4
|
Merge pull request #9879 from Ghommie/Ghommie-cit383
Unmodularize closets.
|
2019-11-23 05:39:33 +00:00 |
|
Putnam3145
|
037b278e9e
|
Merge pull request #9918 from Ghommie/Ghommie-cit384
[S] Makes it compile.
|
2019-11-22 18:14:41 -08:00 |
|
Ghommie
|
77800cf720
|
Oh yea it's a list
|
2019-11-23 03:02:29 +01:00 |
|
Ghommie
|
2d1edf661b
|
Fixes travis.
|
2019-11-23 02:58:03 +01:00 |
|
Putnam3145
|
ea4fdf727b
|
Merge pull request #9917 from Ghommie/Ghommie-cit384
[S] bikehorn fix 2: sound() doesn't accept double quotes i think, my bad.
|
2019-11-22 17:06:50 -08:00 |
|
Ghommie
|
82d97ff4a7
|
This way is better
|
2019-11-23 01:51:31 +01:00 |
|
Ghommie
|
24c93d9df6
|
[S] bikehorn fix 2: sound() datum doesn't accept double quotes, my bad.
|
2019-11-23 01:46:59 +01:00 |
|
CitadelStationBot
|
0c76e9a6d0
|
Automatic changelog generation for PR #9886 [ci skip]
|
2019-11-22 17:48:30 -06:00 |
|
Putnam3145
|
6145cd0d96
|
Merge pull request #9886 from Ghommie/Ghommie-cit384
chem dispenser beakers and bikehorn fixes.
|
2019-11-22 15:48:28 -08:00 |
|
CitadelStationBot
|
404d202f2b
|
Automatic changelog generation for PR #9908 [ci skip]
|
2019-11-22 17:42:56 -06:00 |
|
Putnam3145
|
4fbd42995c
|
Merge pull request #9908 from Ghommie/Ghommie-cit389
Little APC overlays tweak. Removing rogue pixels from the energy gun.
|
2019-11-22 15:42:54 -08:00 |
|
Putnam3145
|
b7f7342e43
|
Merge pull request #9900 from Ghommie/Ghommie-cit388
fixing a get_idcard runtime. or The betrayal of the ?. operator
|
2019-11-22 15:41:52 -08:00 |
|
kiwedespars
|
9999d87b42
|
fixed hands
|
2019-11-21 22:59:57 -08:00 |
|
kiwedespars
|
98998ca85f
|
un-moths the anthromorphic insects
|
2019-11-21 19:47:48 -08:00 |
|
kiwedespars
|
b4b80ef314
|
un-superfluffs the fluff
|
2019-11-21 19:46:53 -08:00 |
|
kiwedespars
|
10b16b2442
|
reverts insect sprites
|
2019-11-21 19:39:51 -08:00 |
|
Ghommie
|
3310a2c435
|
Little APC overlays tweak. Removing rogue pixels from the energy gun.
|
2019-11-22 04:26:00 +01:00 |
|
CitadelStationBot
|
0f9ec5ebb3
|
Automatic changelog generation for PR #9887 [ci skip]
|
2019-11-21 20:39:32 -06:00 |
|
Lin
|
522a664f55
|
Merge pull request #9887 from Ghommie/Ghommie-cit385
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
|
2019-11-22 02:39:29 +00:00 |
|
CitadelStationBot
|
05e3fc1a01
|
Automatic changelog generation for PR #9530 [ci skip]
|
2019-11-21 20:37:52 -06:00 |
|
Lin
|
1ddb9935ff
|
Merge pull request #9530 from Ghommie/Ghommie-cit245
Touching up job outfits equip procs, little PDA fix.
|
2019-11-22 02:37:49 +00:00 |
|
CitadelStationBot
|
0cbfd22c95
|
Automatic changelog generation for PR #9518 [ci skip]
|
2019-11-21 19:36:50 -06:00 |
|
Lin
|
3979079fde
|
Merge pull request #9518 from Ghommie/Ghommie-cit243
Ports "You can now click on objects and mobs below flaps and signs"
|
2019-11-22 01:36:47 +00:00 |
|
CitadelStationBot
|
318709b5c0
|
Automatic changelog generation for PR #9823 [ci skip]
|
2019-11-21 19:16:38 -06:00 |
|
Lin
|
c2d182d50d
|
Merge pull request #9823 from Seris02/wintergalorefix
Adds HoS, HoP, CE, CMO, QM, RD, chemistry, genetics, virology, robotics, janitor and cosmic winter coats - Try 2
|
2019-11-22 01:16:35 +00:00 |
|
CitadelStationBot
|
584455aca0
|
Automatic changelog generation for PR #9871 [ci skip]
|
2019-11-21 19:15:07 -06:00 |
|
Lin
|
6323d9d7c8
|
Merge pull request #9871 from dzahlus/buff-sounds
Sound rework: Gunsounds edition
|
2019-11-22 01:15:05 +00:00 |
|