Commit Graph

36431 Commits

Author SHA1 Message Date
dapnee
e805fd9715 last fix
I saw white flooring under a window and I commited hyperfixation on the room
2020-08-04 13:50:46 -06:00
dapnee
c045016a35 removed some windows that were inside rock
why would you do this?
2020-08-04 13:47:58 -06:00
dapnee
7491d49510 fixes pubby gateway
just stumbling over the map slowly.
2020-08-04 13:45:09 -06:00
dapnee
ad5980636d Pubby Fixes
issues found on pubby are fixed here now as well
2020-08-04 13:31:57 -06:00
dapnee
cb17ea4874 More Active Turf Fixes
None of these nerds make their map names logically and it's hard to find which is which wihout going through a hundred of them.
2020-08-04 12:16:29 -06:00
Changelogs
625fa368e7 Automatic changelog compile [ci skip] 2020-08-04 00:11:43 +00:00
CitadelStationBot
57d381ad67 Automatic changelog generation for PR #12894 [ci skip] 2020-08-03 16:43:10 -05:00
silicons
a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2
port of wounds part 2
2020-08-03 14:43:07 -07:00
CitadelStationBot
d517a7c579 Automatic changelog generation for PR #13010 [ci skip] 2020-08-03 14:54:04 -05:00
silicons
db8abc006a Merge pull request #13010 from Seris02/fixeslizards
lizards no longer break their spines ~~roundstart~~ EVER AGAIN I FUCKING FIXED THE DOUBLE SET_SPECIES LIZARD BUG
2020-08-03 12:54:00 -07:00
Seris02
5551e323cc Update tails.dm 2020-08-03 21:41:30 +08:00
Seris02
82790cffed fixes lizard code 2020-08-03 21:39:11 +08:00
CitadelStationBot
ec9f0d8919 Automatic changelog generation for PR #13004 [ci skip] 2020-08-03 04:31:01 -05:00
silicons
d5a19ea4b2 Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou
prefs for headpat wagging
2020-08-03 02:30:57 -07:00
Seris02
aeec3a3404 lizards no longer have broken spines 2020-08-03 17:29:32 +08:00
Changelogs
d851b3955d Automatic changelog compile [ci skip] 2020-08-03 00:11:50 +00:00
CitadelStationBot
e0114c6964 Automatic changelog generation for PR #12954 [ci skip] 2020-08-02 12:52:10 -05:00
Lin
2885b861f2 Merge pull request #12954 from silicons/killer_queen
bomb stands now use components
2020-08-02 12:52:07 -05:00
CitadelStationBot
a5ac60222f Automatic changelog generation for PR #12989 [ci skip] 2020-08-02 12:50:38 -05:00
Lin
0c85e3f127 Merge pull request #12989 from dapnee/why-is-box-even-fucked-like-this,-smh
You Thought I Was Done Fucking With Box BUT YOU WERE WRONG!
2020-08-02 12:50:34 -05:00
Timothy Teakettle
289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
Timothy Teakettle
03d01d917f Merge branch 'master' into wounds-part-2 2020-08-02 18:10:31 +01:00
CitadelStationBot
a7ba1f0cb7 Automatic changelog generation for PR #12925 [ci skip] 2020-08-02 11:30:13 -05:00
silicons
06f5ce6401 buffs shoving (#12925)
* ^w^

* ok

* ok
2020-08-02 18:30:09 +02:00
zerothebigboy
aa782f1105 a 2020-08-02 02:27:24 -04:00
CitadelStationBot
6618435ee4 Automatic changelog generation for PR #12912 [ci skip] 2020-08-02 01:12:52 -05:00
silicons
f45329bfd7 Merge pull request #12912 from Linzolle/penlight
uv penlight icon
2020-08-01 23:12:49 -07:00
zerothebigboy
34a8d8f798 a 2020-08-02 01:38:23 -04:00
CitadelStationBot
2ef7e1bf0a Automatic changelog generation for PR #12999 [ci skip] 2020-08-01 23:05:54 -05:00
silicons
65d184c552 Merge pull request #12999 from KeRSedChaplain/guardianfix
Removes clockwork guardian's projectile deflection. OOPS!
2020-08-01 21:05:52 -07:00
silicons
25d1fb761a Merge remote-tracking branch 'citadel/master' into killer_queen 2020-08-01 20:51:38 -07:00
Dan-Neposh
6f2d4ac4df makes clockwork guardians have no projectile deflection 2020-08-01 23:36:36 -04:00
CitadelStationBot
a8a1284541 Automatic changelog generation for PR #12983 [ci skip] 2020-08-01 19:45:45 -05:00
Lin
d107d2ec49 Merge pull request #12983 from Citadel-Station-13/silicons-patch-63
fixes nukeops timer being from server start instead of roundstart which gives them 5 free minutes am i salty maybe just a little (no i'm not but we should fix this anyways)
2020-08-01 19:45:42 -05:00
Changelogs
8e021892ca Automatic changelog compile [ci skip] 2020-08-02 00:11:56 +00:00
CitadelStationBot
b9f8af2779 Automatic changelog generation for PR #12993 [ci skip] 2020-08-01 15:31:36 -05:00
silicons
7e0e60c126 Merge pull request #12993 from KeRSedChaplain/toyslabfixfortravis
Toyslabfixfortravis
2020-08-01 13:31:33 -07:00
Dan-Neposh
44e6b6ccc7 I removed the Dread_Ipad, Clockwork Slab reigns supreme 2020-08-01 16:18:25 -04:00
CitadelStationBot
0d7572b777 Automatic changelog generation for PR #12976 [ci skip] 2020-08-01 05:35:49 -05:00
silicons
e8ec73ba7d Merge pull request #12976 from Hatterhat/durathread-kits
Durathread Reinforcement Kits
2020-08-01 03:35:45 -07:00
CitadelStationBot
d83db599c2 Automatic changelog generation for PR #12980 [ci skip] 2020-08-01 05:35:02 -05:00
silicons
d2d598dcfe Merge pull request #12980 from dapnee/What-if-I-keep-fixing-maps
Map Edits Three: The Mappening
2020-08-01 03:34:59 -07:00
CitadelStationBot
3a7c6121bb Automatic changelog generation for PR #12970 [ci skip] 2020-08-01 05:34:21 -05:00
silicons
128225ca6f Merge pull request #12970 from kappa-sama/patch-35
salt pr
2020-08-01 03:34:17 -07:00
CitadelStationBot
0dbc52230f Automatic changelog generation for PR #12965 [ci skip] 2020-08-01 05:33:46 -05:00
silicons
2230a3665a Merge pull request #12965 from timothyteakettle/end-our-suffering
drastically lowers the damage-related benefits of combat mode
2020-08-01 03:33:43 -07:00
CitadelStationBot
66534fd5b6 Automatic changelog generation for PR #12947 [ci skip] 2020-08-01 05:29:19 -05:00
silicons
8dfa3fcce8 Merge pull request #12947 from Seris02/podpersonfix
replica pod fix bounty
2020-08-01 03:29:16 -07:00
silicons
30d82d66d1 Merge pull request #12939 from Sishen1542/iaa-iaa
Reflavors IAA, removes certain items from IAA uplinks, adds TC stealing functionality to uplinks
2020-08-01 02:24:01 -07:00
Heretical Lizard
71783cf760 Merge pull request #12 from Citadel-Station-13/master
updating my branch pog
2020-08-01 04:23:22 -04:00