Commit Graph

26232 Commits

Author SHA1 Message Date
Letter N
1095142a5f Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-26 10:58:12 +08:00
silicons
879ea9c6c8 ok 2020-12-25 14:23:16 -08:00
DeltaFire
971ea2010f Merge pull request #13865 from Citadel-Station-13/silicons-patch-41
cell/proc/give() no longer lets you give negative charge
2020-12-25 19:46:16 +01:00
silicons
6c7b2386d8 Merge pull request #13850 from DeltaFire15/welder-autorefuel-fix
Fixes self-refueling welders
2020-12-25 10:28:59 -07:00
silicons
26a777c011 Merge pull request #13863 from Hatterhat/armbandnames
armbands UNIQUE_RENAME
2020-12-25 10:28:33 -07:00
silicons
488bf18106 Update apc.dm 2020-12-24 21:31:02 -07:00
silicons
f2b16b82fc Update cell.dm 2020-12-24 21:26:25 -07:00
Hatterhat
aa7c871b59 yea 2020-12-24 18:15:04 -06:00
DeltaFire
146135f059 Merge pull request #13836 from silicons/statpanel
refactors statpanel a bit to send topics to client instead of item which bypasses problematic /Topic overrides entirely
2020-12-24 18:29:33 +01:00
DeltaFire
1c82bd689f Merge pull request #13830 from timothyteakettle/apid-fix
fixes apids(bees) not rendering
2020-12-24 18:07:15 +01:00
DeltaFire
7aec74e9c9 Merge pull request #13845 from Citadel-Station-13/silicons-patch-37
fixes dullahans being hardcoded to ignore config unless it's halloween
2020-12-24 17:47:13 +01:00
DeltaFire
0ff6dc8453 Merge pull request #13847 from silicons/regex
fixes not being able to emphasize +s+ingle letters in chat
2020-12-24 17:46:09 +01:00
Letter N
9da84c0acb reg 2020-12-24 14:09:26 +08:00
Letter N
56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
DeltaFire
50aadf5ce5 Merge pull request #13849 from Citadel-Station-13/silicons-patch-38
arachnids officially goes on the list of code features that were made by fetish coders who don't do the basic check of "don't let them cocoon LITERALLY ANY ATOM"
2020-12-23 22:05:32 +01:00
DeltaFire
f9f328a9ea we love this code 2020-12-23 20:12:06 +01:00
Letter N
35edf3589b break it real good 2020-12-23 18:58:02 +08:00
Letter N
47a3afff54 DB stickies 2020-12-23 16:50:48 +08:00
Letter N
61c8f69be8 better telemetry 2020-12-23 15:56:15 +08:00
Letter N
792c9ad752 actualy important because of glidesize 2020-12-23 14:16:29 +08:00
Letter N
18168920ad REVERT YOU GIT 2020-12-23 12:34:50 +08:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
silicons
eaa5070870 Update _job.dm 2020-12-22 20:36:06 -07:00
DeltaFire
7da2f871d0 corrects comment 2020-12-23 03:02:42 +01:00
DeltaFire
8a5cdddb67 actually increases brass welder refueling speed 2020-12-23 02:57:01 +01:00
DeltaFire
4d4d0e9ec3 a fix fix 2020-12-23 02:50:15 +01:00
silicons
11722f6f5e Update arachnid.dm 2020-12-22 17:47:53 -07:00
silicons
0f16f866eb Update arachnid.dm 2020-12-22 17:43:41 -07:00
silicons
2faf0d3fd1 ok 2020-12-22 13:42:03 -07:00
DeltaFire
f75bda735c Merge pull request #13837 from Citadel-Station-13/silicons-patch-31
sprinting now defaults to toggle rather than hold (because 90% of our players probably never check the keybinding preferences and from personal experience, holding down shift to move is awful)
2020-12-22 18:11:02 +01:00
DeltaFire
c37bb9cc2a Merge pull request #13842 from Citadel-Station-13/silicons-patch-35
deletes a tiny segment of dead code
2020-12-22 17:56:13 +01:00
DeltaFire
0b7f7178f9 Merge pull request #13843 from Citadel-Station-13/silicons-patch-36
allows varediting of admin stealthname
2020-12-22 17:55:37 +01:00
DeltaFire
b9b1548c7e Merge pull request #13844 from Arturlang/minter
Fixes mint machine
2020-12-22 17:54:19 +01:00
silicons
c1796db295 Update dullahan.dm 2020-12-22 09:47:26 -07:00
DeltaFire
d796952800 Merge pull request #13835 from silicons/pugilist_parry
Pugilists can now parry most things with their bare hands
2020-12-22 17:42:19 +01:00
DeltaFire
261b9fc517 Merge pull request #13833 from kiwedespars/mmhmhm
bone chitin gloves no longer more murderous than an armblade
2020-12-22 17:41:20 +01:00
DeltaFire
d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
DeltaFire
6d361a87be Merge pull request #13831 from silicons/pod
Fixes contractor pods not taking mobs on leave
2020-12-22 17:38:42 +01:00
silicons
c58a32b9c5 Merge pull request #13820 from DeltaFire15/temp-reebe-removal
[TESTMERGE ONLY] Temporarily disables Reebe
2020-12-22 09:35:47 -07:00
silicons
c939d7aaaf Merge pull request #13822 from DeltaFire15/oops-all-stunhands
Fixes a thing in stunhands used on clockies
2020-12-22 09:32:40 -07:00
silicons
5fb90629e3 Merge pull request #13828 from timothyteakettle/tail-entwine-fix
fix: you can only entwine tails with people who have a tail
2020-12-22 09:32:26 -07:00
silicons
318f8ac3d1 Merge pull request #13832 from Arturlang/tresspass_awakeness
Makes tresspas unusable while unconcious.
2020-12-22 09:32:09 -07:00
DeltaFire
7a9e3fcb40 Merge pull request #13825 from raspy-on-osu/screw-windoors
Windoors stay open longer
2020-12-22 16:16:08 +01:00
DeltaFire
65c14cf289 Merge pull request #13537 from silicons/permissions
support update for event manager permissions
2020-12-22 16:12:03 +01:00
Artur
d72617e7d7 Fixes mint machine 2020-12-22 12:35:21 +02:00
DeltaFire
219470e8c6 Merge pull request #13815 from YakumoChen/no-ezchem
Removes slime blood to jelly conversion
2020-12-22 06:17:41 +01:00
DeltaFire
bdbe1bc404 Merge pull request #13829 from silicons/keyloop
Bandaid fix for input controller lockup due to sleeping
2020-12-22 06:00:29 +01:00
DeltaFire
dd3711bb8a Merge pull request #13823 from MrJWhit/maybe-less-christmas
Maybe less christmas
2020-12-22 05:57:54 +01:00
silicons
5715ea97ce Update holder2.dm 2020-12-21 21:52:44 -07:00
silicons
458f0e4491 Update deadsay.dm 2020-12-21 21:51:52 -07:00