Commit Graph
39316 Commits
Author SHA1 Message Date
CitadelStationBot 520b37bc51 Automatic changelog generation for PR #13658 [ci skip] 2020-11-07 01:30:22 -06:00
siliconsandGitHub a00873a0ee Merge pull request #13658 from DeltaFire15/void-volt-tweaking
Changes to void volt and the clock power_drain() proc
2020-11-07 00:30:19 -07:00
CitadelStationBot d931160c5f Automatic changelog generation for PR #13659 [ci skip] 2020-11-07 01:30:09 -06:00
siliconsandGitHub aab0b000c8 Merge pull request #13659 from timothyteakettle/gateway-fix
admins loading gateways will no longer crash the server
2020-11-07 00:30:06 -07:00
CitadelStationBot 11fb7d4a8d Automatic changelog generation for PR #13641 [ci skip] 2020-11-07 01:29:17 -06:00
siliconsandGitHub 27f53a8af7 Merge pull request #13641 from MrJWhit/combat-knife-nerf
Nerfs combat knife damage
2020-11-07 00:29:14 -07:00
CitadelStationBot 2a647883bf Automatic changelog generation for PR #13639 [ci skip] 2020-11-07 01:20:48 -06:00
siliconsandGitHub 173a1ef0f1 Merge pull request #13639 from Trilbyspaceclone/shhhh
More guns can be suppressed
2020-11-07 00:20:45 -07:00
siliconsandGitHub 6ac42729b3 Merge pull request #13637 from Cyberboss/patch-4
TGS DMAPI Updater deletes old files
2020-11-07 00:20:12 -07:00
CitadelStationBot ea6be927a4 Automatic changelog generation for PR #13635 [ci skip] 2020-11-07 01:20:04 -06:00
siliconsandGitHub cc56fc560e Merge pull request #13635 from Hatterhat/funny-hands-nerf
bone gauntlets bandaid nerf
2020-11-07 00:20:01 -07:00
CitadelStationBot 7b160e147f Automatic changelog generation for PR #13630 [ci skip] 2020-11-07 01:19:32 -06:00
siliconsandGitHub 77a1bdba0c Merge pull request #13630 from timothyteakettle/short-tall-quirks
character size scaling
2020-11-07 00:19:29 -07:00
CitadelStationBot 3cfd32b6a1 Automatic changelog generation for PR #13618 [ci skip] 2020-11-07 01:19:14 -06:00
siliconsandGitHub 2b273addf1 Merge pull request #13618 from Vynzill/mappinghell
new jungle gateway map
2020-11-07 00:19:11 -07:00
CitadelStationBot bc8a6ef265 Automatic changelog generation for PR #13602 [ci skip] 2020-11-07 01:18:54 -06:00
siliconsandGitHub ab33acf962 Merge pull request #13602 from Putnam3145/better_dynamic
Adds a new "minor antag" roundstart to dynamic
2020-11-07 00:18:51 -07:00
CitadelStationBot 32204971fe Automatic changelog generation for PR #13604 [ci skip] 2020-11-07 01:18:29 -06:00
siliconsandGitHub 1a2abc5a2e Merge pull request #13604 from Trilbyspaceclone/welding
Makes welder code better*
2020-11-07 00:18:26 -07:00
CitadelStationBot 14af6be015 Automatic changelog generation for PR #13521 [ci skip] 2020-11-07 01:16:33 -06:00
siliconsandGitHub a13765b7c9 Merge pull request #13521 from DeltaFire15/zeolites-tweaking
[READY] Rebalances zeolites and their reaction
2020-11-07 00:16:29 -07:00
tgstation-server ce8dba6062 Update TGS DMAPI 2020-11-07 00:37:22 +00:00
Timothy Teakettle 82e561675c yes 2020-11-06 21:47:22 +00:00
Timothy Teakettle 1993364ce0 Revert "deletes one word"
This reverts commit 8b7fd151af.
2020-11-06 21:45:52 +00:00
Timothy Teakettle fdd7cc9843 Revert "fix"
This reverts commit 58e884d18e.
2020-11-06 21:45:47 +00:00
Timothy Teakettle e2ca7164b9 age verification 2020-11-06 21:00:14 +00:00
Timothy Teakettle 58e884d18e fix 2020-11-05 21:49:46 +00:00
Timothy Teakettle 8b7fd151af deletes one word 2020-11-05 16:59:49 +00:00
DeltaFire 366c92b115 Bonks travis to actually run 2020-11-05 17:21:25 +01:00
DeltaFire 7d04d805d6 typo 2020-11-05 17:10:02 +01:00
DeltaFire ec456dd386 changes voidvolt + power_drain
see PR desc for details
2020-11-05 16:54:35 +01:00
DeltaFire f9122e23e1 fixes transmission sigils not draining power
if they do stuff while processing, they should probably process.
2020-11-05 13:53:27 +01:00
MrJWhit c1aad0fa27 Update _event.dm 2020-11-04 16:43:44 -05:00
Dip 3afd604913 remove projectiles 2020-11-04 17:28:23 -03:00
timothyteakettle 3d2c07be82 Update human.dm 2020-11-03 22:59:24 +00:00
Dip 0951e9457f right, forgot that object. 2020-11-02 16:50:45 -03:00
Dip 76e739142b Yeah let's fucking not have jacqueen or the christmas tree spawn runtimes 2020-11-02 16:46:34 -03:00
Dip 732556464d Merge remote-tracking branch 'citadel/master' 2020-11-02 16:37:58 -03:00
MrJWhit be9e5acc19 A few fixes to kilo 2020-11-01 21:02:18 -05:00
DeltaFire 2f32879b16 smol change
instead of setting intent, we call the proc for it
2020-11-01 22:35:57 +01:00
DeltaFire 4ebbf0b2dd more typos 2020-11-01 22:26:31 +01:00
DeltaFire 985300b87b typo 2020-11-01 22:14:51 +01:00
siliconsandGitHub d500a12b70 adds EMOTE_BOTH and EMOTE_OMNI which is both audible/visible and ignores checks entirely. subtler/subtle is omni and regular emotes are both. (#13584)
* Update say.dm

* Update mob.dm

* Update emotes.dm

* Update say_vr.dm

* Update emote.dm

* Update emotes.dm

* Update mob.dm

* Update say_vr.dm

* Update drake.dm
2020-11-01 22:09:38 +01:00
siliconsandGitHub 4017618744 removes batform from roundstart halloween vampire (#13623)
* Update species.dm

* Update vampire.dm

* Update vampire.dm
2020-11-01 22:05:49 +01:00
DeltaFire f1178a65a0 admin edit thingy
admins can edit both normal toxdamage and corruption
2020-11-01 22:04:28 +01:00
CitadelStationBot 4ae92bc482 Automatic changelog generation for PR #13632 [ci skip] 2020-11-01 15:03:46 -06:00
Timothy TeakettleandGitHub db87297536 fix (#13632) 2020-11-01 22:03:43 +01:00
CitadelStationBot 99b7504795 Automatic changelog generation for PR #13633 [ci skip] 2020-11-01 15:02:17 -06:00
9eff4147fd Fixes the Layer 3 Outlet Injector mapping asset being on the wrong layer (#13633)
* why is this on the wrong layer?

* ahem, icon state.

Co-authored-by: Dip <gabriel.spm002@gmail.com>
2020-11-01 22:02:15 +01:00
CitadelStationBot 75957ac7aa Automatic changelog generation for PR #13629 [ci skip] 2020-11-01 15:02:00 -06:00