c80d65df73
Merge branch 'master' into familyport
2021-10-28 14:34:20 -04:00
4b13d1772c
[Ready] Bone Anvil and processable Bone ingots ( #15290 )
...
* Adding all the extra stuff
* whoops, slipped my last fix in here.
* bone balance
* 6 Goliaths + 3 Watchers + 1 Legion
* bumps the damage modifier down to 1.05
* More Bones.
* Undoes the undoing of the other fix PR
Co-authored-by: Emily <null>
2021-10-25 18:11:54 +02:00
34e6187add
Merge pull request #15148 from Citadel-Station-13/silicons-patch-1
...
disables prisoners
2021-10-24 22:02:27 -04:00
e1aeaa76fd
Merge pull request #15280 from Putnam3145/siphoning-vents
...
Allows setting vents to siphon
2021-10-24 15:09:35 -07:00
5066e34736
Merge pull request #15258 from keronshb/pirate10k
...
Raises Pirate pay rate back to 10000 again.
2021-10-24 15:09:03 -07:00
921717d9cd
tesla counterplay now accounts for grounding rod capacitor type ( #15291 )
...
* tesla energy loss accounts for capacitor rating
* reverse qdel and energy loss as suggested
Co-authored-by: = <=>
2021-10-23 03:58:39 +02:00
5035536311
Clowncar does not ignore airlocks again ( #15220 )
...
* no airlock tomfoolery
* Update clowncar.dm
* Update clowncar.dm
* assuming direct control
fixes inconsistant indentation.
* inverted operators
Co-authored-by: DeltaFire <andreoxgrievous@gmail.com >
2021-10-21 21:03:59 +02:00
5e964fe98e
Merge pull request #15289 from WanderingFox95/boneglaivesprite
...
Bone glaive sprites didn't show up properly...
2021-10-21 11:19:17 -07:00
2d439ffc71
Merge pull request #15209 from Putnam3145/more-ashwalker-woes
...
More ashwalker lung adjustments
2021-10-20 17:49:20 -07:00
57950045a7
Fixes the sprites for wielding.
2021-10-20 10:06:14 +02:00
136ca1f107
Merge branch 'master' into more-ashwalker-woes
2021-10-18 04:35:57 -07:00
34936ee5af
Properly implements hysteresis
2021-10-18 03:44:40 -07:00
b593774cc9
Merge pull request #15274 from keronshb/dynamicloneophijack
...
Removes Dynamic's ability to hijack loneop
2021-10-17 19:56:00 -07:00
42da1e2079
Allows setting vents to siphon
2021-10-17 19:55:13 -07:00
1f7e65ad01
Merge pull request #15271 from Citadel-Station-13/admin_tickets
...
fixes "answered by <admin>" spam in irc
2021-10-15 23:34:15 -07:00
daeaacd81c
Removes Dynamic's ability to hijack loneop
2021-10-15 22:04:01 -04:00
46e5372f10
No anthro icons
2021-10-15 19:57:11 -04:00
6b23d177c8
Merge remote-tracking branch 'upstream/master'
2021-10-15 19:25:41 -04:00
95bb14bb67
Adds the missing hats, missing wings, and clothes to vendor.
2021-10-15 16:59:16 -04:00
1cd2c59776
Merge branch 'master' into familyport
2021-10-15 14:43:53 -04:00
b9923de4e4
Disables the Antag UI panel for non families
2021-10-15 14:24:00 -04:00
e6e0341cd8
Merge pull request #15268 from WanderingFox95/WanderingFox95-BDMFix
...
Removes the proc loop from the BDM's AI.
2021-10-15 00:19:26 -07:00
e99688242f
Merge pull request #15266 from SandPoot/tiny-sized-fixes
...
Tiny sized fixes
2021-10-15 00:18:48 -07:00
d17419ed54
Merge pull request #15256 from keronshb/fatdart
...
no idea what this thing even is but he's chuffin back a fat dart and that's all that matters
2021-10-15 00:18:39 -07:00
a8c5df2b4b
Merge pull request #15263 from DeltaFire15/ping-time
...
Adds pinging to asay
2021-10-15 00:18:02 -07:00
cca9efebd4
Merge pull request #15253 from SandPoot/tackler-gloves-no-spam-and-only-worn
...
Tackler gloves only work being worn
2021-10-15 00:17:49 -07:00
1427157df3
Fixes space cops and adds config for dynamic
2021-10-15 00:12:46 -04:00
aaa3fa277e
Adds hear_1, cells work.
2021-10-14 23:46:43 -04:00
d0eade8fe1
fix
2021-10-14 19:20:32 -07:00
29a01f2d05
Antag Info and fixing the handshake finally
2021-10-14 20:43:41 -04:00
8cb16aa0f3
Fixes item transfers
2021-10-14 17:26:17 -04:00
13140f9bb9
Somewhat fixed huds and stuff, not 100%
2021-10-14 16:36:18 -04:00
bf7cd77096
Fixes a few things
2021-10-13 23:25:01 -04:00
6331ced3e5
The rest of the offering stuff
2021-10-13 22:13:33 -04:00
75fee6ec25
applies requested changes
2021-10-13 22:25:15 +02:00
afbc34eea2
Hmm
2021-10-13 22:18:07 +02:00
6763324506
Fixes the BDM's proc loop (Ported from TG)
2021-10-13 21:47:24 +02:00
608b6fbb1b
Upload files
2021-10-12 22:17:43 -03:00
e2ab532de2
Removes old gangs, families is almost ready
2021-10-12 16:34:27 -04:00
bd7a2b6a2a
Lets families compile
2021-10-12 16:12:38 -04:00
d88933b492
Families wanted stars now only show up when you are involved in it, and announcements for wanted level changes ( #50283 )
...
* Wanted level stuff
* fuck
* Update code/game/gamemodes/gang/gang.dm
Co-Authored-By: Rohesie <rohesie@gmail.com >
* Update code/_onclick/hud/families.dm
Co-Authored-By: Rohesie <rohesie@gmail.com >
* Update code/game/gamemodes/gang/gang.dm
Co-Authored-By: Rohesie <rohesie@gmail.com >
* Update code/modules/antagonists/gang/gang.dm
Co-Authored-By: Rohesie <rohesie@gmail.com >
* Update code/modules/antagonists/ert/ert.dm
Co-Authored-By: Rohesie <rohesie@gmail.com >
Co-authored-by: Rohesie <rohesie@gmail.com >
2021-10-12 14:03:33 -04:00
41013ec815
Part 2 - Missing stuff from original families port
2021-10-12 12:07:02 -04:00
f623d6e7eb
Merge pull request #15229 from Hatterhat/perhaps-i-was-a-bit-too-harsh
...
vareditable clip reloading delay for shotguns
2021-10-11 20:46:06 -07:00
91e7cb293c
Merge pull request #15223 from Hatterhat/yeehaw-box
...
The Yeehaw Update - makes .38 lever-actions slightly more accessible
2021-10-11 20:45:42 -07:00
0bae06adcd
Original Port
2021-10-11 22:00:54 -04:00
b6fdf671f1
Merge pull request #15215 from silicons/afk_tracking
...
fixes afk detection
2021-10-11 15:52:03 -07:00
3209917830
Merge pull request #15173 from silicons/vpn_block
...
adds PANIC_BUNKER_LIVING_VPN option (READ, THIS IS NOT A VPN BAN)
2021-10-11 15:51:52 -07:00
83ebebaa05
Merge pull request #14890 from Citadel-Station-13/silicons-patch-44
...
[experimental] changes to slowdown scaling
2021-10-11 15:51:33 -07:00
5680b74294
safety
2021-10-11 20:32:00 +02:00
66e81e7fda
asay ping time
2021-10-11 19:52:30 +02:00
keronshb