Commit Graph

6253 Commits

Author SHA1 Message Date
keronshb
c9697f4bbf Fixes dynamic 2021-09-23 19:38:15 -04:00
keronshb
c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
keronshb
13323d2597 Merge branch 'master' into dynamicport 2021-09-19 17:59:09 -04:00
zeroisthebiggay
7fce515ca4 Update robot_modules.dm 2021-09-19 16:01:29 -04:00
zeroisthebiggay
4ab88cfcdb Update robot_modules.dm 2021-09-19 15:59:45 -04:00
zeroisthebiggay
2f903353a6 Update robot_modules.dm 2021-09-19 15:56:40 -04:00
zerothebigboy
c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	tgstation.dme
2021-09-19 15:23:52 -04:00
silicons
c60e54e0d3 Merge pull request #15074 from keronshb/paiports
PORTS PAI Emag Act
2021-09-19 11:12:02 -07:00
silicons
f48bf3cdc0 Merge pull request #15174 from buffyuwu/holoparasites
probably fixes holoparasites
2021-09-19 11:10:45 -07:00
silicons
9a393e07f8 Merge pull request #15171 from DeltaFire15/ventcrawl-I-want-to-cry
Hey raspy why can plastic golems ventcrawl even with equipment?
2021-09-19 11:08:45 -07:00
keronshb
1f71740803 . 2021-09-19 14:08:01 -04:00
silicons
1bc24575d4 Merge pull request #15084 from keronshb/plaguefix
Fixes Plague Rats + other buffs
2021-09-19 11:03:05 -07:00
keronshb
6cc4e35b44 Mob lists 2021-09-19 13:28:41 -04:00
buffyuwu
96643c7aba probably fixes holoparasites
closes #15151 if it works
2021-09-18 01:22:24 -04:00
DeltaFire
3f1d060a38 hey raspy why can plastic golems always ventcrawl 2021-09-17 21:02:58 +02:00
keronshb
7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00
silicons
fb05100008 Update mouse.dm (#15115) 2021-09-15 00:16:57 +02:00
Lin
d53820d9bf Merge pull request #15130 from Citadel-Station-13/when_why
[02:58:00] Runtime in atoms.dm, line 574: type mismatch: "catghost" &= 16777215
2021-09-14 01:08:06 -05:00
silicons
6524e3d539 Update species.dm (#15126) 2021-09-14 02:23:52 +02:00
silicons
4c058114a6 Update login.dm 2021-09-12 20:37:03 -07:00
keronshb
4cb198fe05 Fixes Hitby runtime 2021-09-11 17:38:32 -04:00
keronshb
bb74dd4adf Cap fix 2021-09-10 12:01:46 -04:00
silicons
c600fae409 Merge pull request #15103 from SandPoot/cyborg-grippers
Does some nice stuff on cyborg grippers
2021-09-09 17:59:47 -07:00
Lin
0a005438ab Merge pull request #15100 from Citadel-Station-13/silicons-patch-5
salt fixes colossus crystals not reading direction anymore due to a projectile update
2021-09-09 19:51:05 -05:00
keronshb
a2a8d74fd8 Vent and spawning 2021-09-09 20:12:47 -04:00
Lin
3f09f56e3d Merge pull request #15101 from Citadel-Station-13/silicons-patch-6
fixes the comedy antag parry gauntlets
2021-09-09 19:10:51 -05:00
silicons
69bd477a72 Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
SandPoot
759852a31d Update inventory.dm 2021-09-08 20:02:23 -03:00
SandPoot
37e2470616 Upload files 2021-09-08 19:53:47 -03:00
silicons
7d62753fe4 Update living_active_parry.dm 2021-09-08 04:44:36 -07:00
silicons
5de5be462f Update colossus.dm 2021-09-08 02:36:40 -07:00
keronshb
2808e855b5 Explosive Pop fix 2021-09-06 10:30:41 -04:00
keronshb
5102cacdb4 Prevents them from spawning off station z 2021-09-06 09:50:21 -04:00
keronshb
468a610f15 Corpsefix 2021-09-06 09:31:45 -04:00
keronshb
a8d1b377e4 Plaguefix 2021-09-05 21:22:53 -04:00
keronshb
8904950cf5 Gremlinfix 2021-09-05 14:35:38 -04:00
Lin
3b10346961 Merge pull request #15067 from timothyteakettle/fixes-synth-markings
makes the arm/leg markings for synthetic lizards appear as an option again
2021-09-03 13:52:15 -05:00
keronshb
bf2b45050a Pai EMAG act 2021-09-03 13:46:59 -04:00
Putnam3145
2692f6285f Fixes a runtime in ghost update_icon
Please make sure that no overrides have arguments when you add a new argument to a method.
2021-09-03 01:21:21 -07:00
Lin
9b888c7b01 Merge pull request #15059 from timothyteakettle/language-fixies
fixes losing your additional language upon changing species
2021-09-02 16:37:43 -05:00
Timothy Teakettle
cd04aed49e Update synthliz.dm 2021-09-02 18:35:52 +01:00
timothyteakettle
a33a7ed249 fix 2021-09-01 17:54:14 +01:00
silicons
d427c43b7b Merge pull request #15032 from keronshb/itemhighlight
Ports Inventory Outlines
2021-08-26 21:41:25 -07:00
silicons
3cae7df6c8 Merge pull request #15002 from keronshb/plaguerats
Plague Rats
2021-08-26 21:41:07 -07:00
silicons
13130b3ee6 Merge pull request #15015 from keronshb/gremlinport
Gremlin Port
2021-08-26 21:40:59 -07:00
silicons
2c69193337 Merge pull request #15037 from DeltaFire15/corpse-fix
Fixes demons scattering dropped bodies all over the station, plus space dragon content ejection
2021-08-26 21:38:29 -07:00
zerothebigboy
dec2ea645e nuts 2021-08-26 22:57:22 -04:00
keronshb
47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
DeltaFire
e87bd464ff sigh 2021-08-26 04:21:52 +02:00
DeltaFire
c713dbdef1 carprift armor 2021-08-26 04:20:23 +02:00