 kevinz000
|
25a2b34c38
|
some fixes
|
2020-02-26 05:59:53 -07:00 |
|
|
kevinz000
|
872872d9f9
|
move stuff
|
2020-02-26 05:38:34 -07:00 |
|
|
kevinz000
|
76c1d5ddb9
|
k
|
2020-02-25 15:40:00 -07:00 |
|
|
kevinz000
|
5a320c7933
|
fugg u
|
2020-02-25 14:37:40 -07:00 |
|
|
kevinz000
|
40c2bdf5ee
|
oh boy
|
2020-02-25 14:06:12 -07:00 |
|
|
kevinz000
|
bfb8139225
|
DefaultCombatknockdown
|
2020-02-25 03:18:37 -07:00 |
|
|
kevinz000
|
8b06f6d4e9
|
message fix
|
2020-02-25 03:08:34 -07:00 |
|
|
kevinz000
|
2eae147e93
|
ok
|
2020-02-24 16:51:35 -07:00 |
|
|
kevinz000
|
424eb48d9e
|
fixes
|
2020-02-24 01:59:45 -07:00 |
|
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
|
kevinz000
|
b8d60a33bd
|
partial fix
|
2020-02-21 23:29:13 -07:00 |
|
|
CitadelStationBot
|
d4e1c30597
|
Automatic changelog generation for PR #10848 [ci skip]
|
2020-02-22 00:28:47 -06:00 |
|
|
kevinz000andGitHub
|
856af1f182
|
Merge pull request #10848 from Ghommie/Ghommie-cit229
Porting Floyd Materials: Trying again edition
|
2020-02-21 23:28:44 -07:00 |
|
|
kevinz000andGitHub
|
5a580dda20
|
Update suppression.dm
|
2020-02-21 18:18:37 -07:00 |
|
|
kevinz000andGitHub
|
24ba8b4d04
|
Update haste.dm
|
2020-02-21 18:17:54 -07:00 |
|
|
kevinz000andGitHub
|
f2a17b8b35
|
Update robot_mobility.dm
|
2020-02-21 18:17:07 -07:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
kevinz000
|
665e95d827
|
compile
|
2020-02-21 15:03:22 -07:00 |
|
|
kevinz000
|
e85699df50
|
compile fix
|
2020-02-21 14:18:45 -07:00 |
|
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|
|
CitadelStationBot
|
869fb5e897
|
Automatic changelog generation for PR #11175 [ci skip]
|
2020-02-21 09:46:22 -06:00 |
|
|
GhomandGitHub
|
42416483e7
|
Merge pull request #11175 from keronshb/NaniteFixes
Fixes healing nanites
|
2020-02-21 16:46:19 +01:00 |
|
|
CitadelStationBot
|
0cffb2e672
|
Automatic changelog generation for PR #11176 [ci skip]
|
2020-02-20 20:50:50 -06:00 |
|
|
GhomandGitHub
|
aceb76283f
|
Merge pull request #11176 from Putnam3145/why-what
Fixing IRV again or: how I learned to start worrying and actually hate byond
|
2020-02-21 03:50:47 +01:00 |
|
|
Putnam
|
9f9881b57e
|
this is so sad
|
2020-02-20 18:43:36 -08:00 |
|
|
CitadelStationBot
|
62ad68f1ef
|
Automatic changelog generation for PR #11156 [ci skip]
|
2020-02-20 19:47:21 -06:00 |
|
|
GhomandGitHub
|
8395ee53e7
|
Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
|
2020-02-21 02:47:18 +01:00 |
|
|
CitadelStationBot
|
1f843e6c4b
|
Automatic changelog generation for PR #11163 [ci skip]
|
2020-02-20 19:43:33 -06:00 |
|
|
GhomandGitHub
|
91cbc8fb3c
|
Merge pull request #11163 from MrJWhit/update-to-teg-design
Quick TEG update
|
2020-02-21 02:43:30 +01:00 |
|
|
CitadelStationBot
|
f0599e2925
|
Automatic changelog generation for PR #10541 [ci skip]
|
2020-02-20 19:43:06 -06:00 |
|
|
GhomandGitHub
|
e92183e968
|
Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL to box station
|
2020-02-21 02:43:04 +01:00 |
|
|
keronshb
|
7a1bc9d22b
|
Fixes the travis issues
Fixes the travis issues, Exo still remains a mystery
|
2020-02-20 19:11:04 -05:00 |
|
|
Putnam
|
a49260e0ac
|
Revert "maybe this'll work."
This reverts commit 8d00f11fc1.
|
2020-02-20 16:03:00 -08:00 |
|
|
Putnam
|
8d00f11fc1
|
maybe this'll work.
|
2020-02-20 16:01:06 -08:00 |
|
|
keronshb
|
4ca9eb4171
|
Fixes healing nanites
Fixes Accelerated Regeneration, Bio Regen, and Mechanical.
Also changed one line on Exo nanites but it doesn't fix those. Dunno what to do.
|
2020-02-20 18:11:54 -05:00 |
|
|
CitadelStationBot
|
a80a770310
|
Automatic changelog generation for PR #11155 [ci skip]
|
2020-02-20 16:50:11 -06:00 |
|
|
LinandGitHub
|
9999e15db9
|
Merge pull request #11155 from necromanceranne/cham_project_exploities
Cham projector no longer lets you become literally unclickable
|
2020-02-20 16:50:07 -06:00 |
|
|
CitadelStationBot
|
116d2b190d
|
Automatic changelog generation for PR #11157 [ci skip]
|
2020-02-20 13:53:30 -06:00 |
|
|
GhomandGitHub
|
613158fe4e
|
Merge pull request #11157 from Putnam3145/lick-pref
Lick pref
|
2020-02-20 20:53:27 +01:00 |
|
|
CitadelStationBot
|
505c93a68b
|
Automatic changelog generation for PR #11154 [ci skip]
|
2020-02-20 13:52:32 -06:00 |
|
|
GhomandGitHub
|
4649183a47
|
Merge pull request #11154 from Kraseo/fuck-nightmares
Fixes nightmares deleting guns with flashlights
|
2020-02-20 20:52:29 +01:00 |
|
|
CitadelStationBot
|
0892837e5a
|
Automatic changelog generation for PR #10572 [ci skip]
|
2020-02-20 08:33:30 -06:00 |
|
|
GhomandGitHub
|
7763475b83
|
Merge pull request #10572 from Tupinambis/SiliconDefault
Removes harm prevention clause indicators from relevant sources.
|
2020-02-20 15:33:27 +01:00 |
|
|
CitadelStationBot
|
ee07f1312e
|
Automatic changelog generation for PR #11142 [ci skip]
|
2020-02-20 08:31:42 -06:00 |
|
|
GhomandGitHub
|
6347dab0a3
|
Merge pull request #11142 from kevinz000/vampire_haste
makes vampire haste more reliable and slightly less of an example of how not to code
|
2020-02-20 15:31:39 +01:00 |
|
|
CitadelStationBot
|
549e3d7fbd
|
Automatic changelog generation for PR #10649 [ci skip]
|
2020-02-20 07:40:11 -06:00 |
|
|
GhomandGitHub
|
608bb0a04c
|
Merge pull request #10649 from kevinz000/hijack
Completely reworks the hijack objective, and shuttle hijacking in general
|
2020-02-20 14:40:08 +01:00 |
|
|
CitadelStationBot
|
6ffde67b78
|
Automatic changelog generation for PR #11153 [ci skip]
|
2020-02-20 07:17:36 -06:00 |
|
|
kevinz000andGitHub
|
ca777c6c8b
|
Merge pull request #11153 from Ghommie/Ghommie-cit587
Fixing addiction moodlets not going away and secret sauce recipe paper.
|
2020-02-20 06:17:33 -07:00 |
|
|
CitadelStationBot
|
c5c29faf4b
|
Automatic changelog generation for PR #11136 [ci skip]
|
2020-02-20 04:48:08 -06:00 |
|