Commit Graph

41098 Commits

Author SHA1 Message Date
timothyteakettle
a9170aae93 Update priority_announce.dm 2021-02-06 17:42:37 +00:00
CitadelStationBot
c95896b473 Automatic changelog generation for PR #13890 [ci skip] 2021-02-05 23:52:20 -06:00
Lin
fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
DeltaFire
bbcf23fae9 Merge pull request #14182 from Citadel-Station-13/silicons-patch-8
i hate xenobiology players
2021-02-05 16:09:58 +01:00
silicons
3f4aff09d1 Update code/modules/research/xenobiology/crossbreeding/_status_effects.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-02-05 00:59:19 -07:00
Changelogs
02e9ce07c2 Automatic changelog compile [ci skip] 2021-02-05 00:13:56 +00:00
CitadelStationBot
27b0e3264b Automatic changelog generation for PR #14159 [ci skip] 2021-02-04 16:04:12 -06:00
DeltaFire
df3f4a7ca6 Merge pull request #14159 from raspy-on-osu/ventcrawling-refactor-fix2
Fixes Alien Royals being able to ventcrawl
2021-02-04 23:04:09 +01:00
raspy-on-osu
a7dd74201c 2 2021-02-04 16:51:06 -05:00
raspy-on-osu
3a3b3966a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ventcrawling-refactor-fix2 2021-02-04 16:46:37 -05:00
DeltaFire
d364fdbc6d Merge pull request #14193 from Citadel-Station-13/silicons-patch-9
sanitizes id cards
2021-02-04 21:26:50 +01:00
silicons
89c63a243f Update card.dm 2021-02-04 13:23:03 -07:00
silicons
9d4444d512 Merge pull request #14188 from zeroisthebiggay/godimsoscuffed
i forgot a sprite
2021-02-04 12:57:43 -07:00
CitadelStationBot
29362c7cfa Automatic changelog generation for PR #14183 [ci skip] 2021-02-04 13:56:05 -06:00
silicons
055b1a1db8 Merge pull request #14183 from timothyteakettle/by-armok-by-beard
dwarf facial hair is no longer randomised
2021-02-04 12:56:01 -07:00
CitadelStationBot
91f027acf9 Automatic changelog generation for PR #14174 [ci skip] 2021-02-04 13:53:17 -06:00
silicons
497c6b8d2c Merge pull request #14174 from keronshb/meathook-adjustment
Meathook Adjustments
2021-02-04 12:53:14 -07:00
CitadelStationBot
af488711d0 Automatic changelog generation for PR #14172 [ci skip] 2021-02-04 13:50:32 -06:00
silicons
d4f978c6db Merge pull request #14172 from keronshb/cell-charger-upgrade
Cell Charger Buffs
2021-02-04 12:50:30 -07:00
CitadelStationBot
e5e2c2d303 Automatic changelog generation for PR #14170 [ci skip] 2021-02-04 13:50:22 -06:00
silicons
a3fc6b7f80 Merge pull request #14170 from SmArtKar/firer_fix
Fixes KAs being broken by circuits
2021-02-04 12:50:19 -07:00
CitadelStationBot
bcb6755c33 Automatic changelog generation for PR #14155 [ci skip] 2021-02-04 13:49:13 -06:00
silicons
993a849700 Merge pull request #14155 from SmArtKar/tgui_observe
Port of TG's "Auto Observe"
2021-02-04 12:49:09 -07:00
CitadelStationBot
ddacd75efe Automatic changelog generation for PR #14132 [ci skip] 2021-02-04 13:45:14 -06:00
silicons
bec5d6d8a3 Merge pull request #14132 from shellspeed1/salt-nerf-romerol
MASSIVE SALT NERF
2021-02-04 12:45:11 -07:00
zerothebigboy
50a47f56bb i forgot a sprite 2021-02-03 11:51:50 -05:00
Changelogs
1f00b6fab2 Automatic changelog compile [ci skip] 2021-02-03 00:14:12 +00:00
CitadelStationBot
21ccfcff5c Automatic changelog generation for PR #14184 [ci skip] 2021-02-01 20:13:32 -06:00
Lin
5c626c739c Merge pull request #14184 from Hatterhat/green-saber-fix
oops/speedmerge pls - fixes green esaber forward facing sprite
2021-02-01 20:13:28 -06:00
Changelogs
f4128a4e9d Automatic changelog compile [ci skip] 2021-02-02 00:18:31 +00:00
CitadelStationBot
3a259c0ea9 Automatic changelog generation for PR #13895 [ci skip] 2021-01-31 23:35:40 -06:00
Lin
2d3627b75c Merge pull request #13895 from Citadel-Station-13/silicons-patch-53
Restores speedup to meth and nuka cola
2021-01-31 23:35:37 -06:00
Lin
1d275656b5 Merge pull request #14081 from Citadel-Station-13/silicons-patch-22
makes paraplegic spawn effects yield for calling function which MIGHT fix not spawning in with a wheelchair maybe(?)
2021-01-31 23:34:20 -06:00
CitadelStationBot
237c33940b Automatic changelog generation for PR #14113 [ci skip] 2021-01-31 23:34:03 -06:00
Lin
0dd82df64b Merge pull request #14113 from silicons/piggybacking
fixes piggybacking initial offsets. Also, adds the ability to carry around pAIs, because this totally won't result in more metaclique drama.
2021-01-31 23:33:59 -06:00
Hatterhat
7c50b45e0d oops 2021-01-31 19:53:58 -06:00
timothyteakettle
276dfee0d8 Update dwarves.dm 2021-02-01 01:29:37 +00:00
silicons
503d71ea45 Update _status_effects.dm 2021-01-31 18:03:36 -07:00
Changelogs
d41acaeb96 Automatic changelog compile [ci skip] 2021-01-31 00:18:10 +00:00
keronshb
68b65c3f93 Fixes some error, re adds knockdown
should prevent item drops
2021-01-30 16:19:09 -05:00
keronshb
8a75d59db2 Meathook tweaks
Changes some values to make it a bit more fair.
2021-01-30 15:59:59 -05:00
keronshb
10c0e40d71 Removes extra update icon
Removes extra update icon
2021-01-30 14:40:11 -05:00
keronshb
f85accc406 Upgrades cell chargers
Similar to weapon cell chargers
2021-01-30 13:26:45 -05:00
DeltaFire
6804d79aff Merge pull request #14167 from Citadel-Station-13/silicons-patch-6
eye lighting is no longer able to be clicked or realistically interacted with
2021-01-30 19:13:40 +01:00
DeltaFire
c417d576ec Merge pull request #14152 from Arturlang/turret_fixing_redo
Brings back turret fixing
2021-01-30 19:10:10 +01:00
CitadelStationBot
1acebf09ee Automatic changelog generation for PR #14031 [ci skip] 2021-01-30 11:44:23 -06:00
DeltaFire
ee7c45fe77 Merge pull request #14031 from Putnam3145/fermi-emp-fix
Fixes fermichem EMPs being massive.
2021-01-30 18:44:20 +01:00
keronshb
ac6156b2b2 Merge remote-tracking branch 'origin/master' 2021-01-30 11:06:42 -05:00
shellspeed1
78651f00e3 Update uplink_stealth.dm 2021-01-30 01:27:22 -08:00
SmArtKar
98e75f4f29 Fixes nuclear and KA guns in IC 2021-01-30 12:13:06 +03:00