Commit Graph

28726 Commits

Author SHA1 Message Date
ShadeAware e1fb7f3e64 Update hud.dm 2020-01-21 18:49:37 -05:00
ShadeAware 50d3b4b78e Add files via upload 2020-01-21 18:45:54 -05:00
ShadeAware 413bfc276e Delete glasses.dmi 2020-01-21 18:45:44 -05:00
ShadeAware 79ebe54eff Add files via upload 2020-01-21 18:45:24 -05:00
ShadeAware 6aba2c1716 Delete eyes.dmi 2020-01-21 18:45:09 -05:00
ShadeAware 08016a8461 Ghommie commands, I obey. 2020-01-20 20:22:09 -05:00
ShadeAware 851815f9c4 Update recipes_weapon_and_ammo.dm 2020-01-20 18:50:57 -05:00
ShadeAware 9f488c80a1 Update weaponry.dm 2020-01-20 18:49:04 -05:00
ShadeAware 6f243f9c44 Update weaponry.dm 2020-01-20 18:08:05 -05:00
ShadeAware cd001411e1 Update recipes_weapon_and_ammo.dm 2020-01-20 18:02:07 -05:00
ShadeAware a188f121b4 Add files via upload 2020-01-20 17:38:15 -05:00
ShadeAware 2d413d8474 Delete items_and_weapons.dmi 2020-01-20 17:38:01 -05:00
ShadeAware d1c45bf588 Add files via upload 2020-01-20 17:36:25 -05:00
ShadeAware 99e84b6db8 Delete swords_righthand.dmi 2020-01-20 17:36:04 -05:00
ShadeAware 034eb84c65 Delete swords_lefthand.dmi 2020-01-20 17:35:53 -05:00
ShadeAware ffef7cd4db Update weaponry.dm 2020-01-20 17:33:18 -05:00
CitadelStationBot a99090ddbf Automatic changelog generation for PR #10617 [ci skip] 2020-01-20 13:02:09 -06:00
Ghom 4c6af66050 Merge pull request #10617 from Citadel-Station-13/kevinz000-patch-16
Grenades can now actually have their timers adjusted
2020-01-20 20:02:06 +01:00
CitadelStationBot 06e23144a8 Automatic changelog generation for PR #10621 [ci skip] 2020-01-20 11:50:27 -06:00
Ghom 28a6e6eccf Merge pull request #10621 from Hatterhat/am-i-really-gonna-do-this
.357 AP printable from illegal ballistics
2020-01-20 18:50:25 +01:00
CitadelStationBot 5bd2b13233 Automatic changelog generation for PR #10615 [ci skip] 2020-01-20 11:04:34 -06:00
Ghom b85e752e46 Merge pull request #10615 from keronshb/RemoteMoodResearch
Fixes the nanite sprites deleting the game sprites
2020-01-20 18:04:31 +01:00
CitadelStationBot 0f4f07dc95 Automatic changelog generation for PR #10346 [ci skip] 2020-01-20 00:11:05 -06:00
kevinz000 593e626233 Merge pull request #10346 from deathride58/limbstamlossnerf
Nerfs limb stamcrit by doubling the base limb stam regen rate and making disabled limbs double the regen rate further
2020-01-19 23:11:02 -07:00
Hatterhat 28a2cc4a3d .357 AP printable from illegal ballistics 2020-01-19 23:55:12 -06:00
CitadelStationBot 8e30dd2282 Automatic changelog generation for PR #10597 [ci skip] 2020-01-19 20:24:49 -06:00
Ghom 77911f9009 Merge pull request #10597 from Putnam3145/player-panel-can-reenter
Ghost role eligibility activation in player panel
2020-01-20 03:24:46 +01:00
CitadelStationBot 194647a7f4 Automatic changelog generation for PR #10614 [ci skip] 2020-01-19 20:24:02 -06:00
Ghom 8a091c5140 Merge pull request #10614 from Putnam3145/suicide_option
Made suicide a config flag
2020-01-20 03:24:00 +01:00
Putnam3145 56e58e5c5e whoops
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-01-19 18:14:33 -08:00
Putnam 16f9c1bf78 feedback, EORG allowed 2020-01-19 18:01:21 -08:00
keronshb ea088680e2 Fixed sprites
This should be it, really
2020-01-19 19:25:14 -05:00
CitadelStationBot 705bb9c29e Automatic changelog generation for PR #10097 [ci skip] 2020-01-19 17:58:30 -06:00
kevinz000 65eaf9787a Merge pull request #10097 from Ghommie/Ghommie-cit444
Made traitor kevlar/armor padding accessories examine-proof.
2020-01-19 16:58:27 -07:00
kevinz000 b1cd0f4ede Update grenade.dm 2020-01-19 16:11:49 -07:00
CitadelStationBot 92ead7e65d Automatic changelog generation for PR #9601 [ci skip] 2020-01-19 17:10:59 -06:00
kevinz000 088e586b47 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-01-19 16:10:56 -07:00
kevinz000 90fcedd188 Update grenade.dm 2020-01-19 13:40:09 -07:00
keronshb a4f35eed47 This should fix the icon
icon fix pt 2, I swear
2020-01-19 14:33:41 -05:00
keronshb 6725e99661 icon fix pt1
icon fix pt1
2020-01-19 14:26:16 -05:00
Ghom cf9c3a65fd Merge pull request #10587 from Arturlang/Bloodsucker_antag_bans
Adds bloodsucker antagonist bans
2020-01-19 16:38:45 +01:00
CitadelStationBot ecaff2ffe8 Automatic changelog generation for PR #10520 [ci skip] 2020-01-19 09:37:42 -06:00
Ghom 536900a7ac Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
2020-01-19 16:37:40 +01:00
CitadelStationBot 95cddfed27 Automatic changelog generation for PR #10307 [ci skip] 2020-01-19 09:35:50 -06:00
Ghom 812182230f Merge pull request #10307 from Seris02/stunglasses
stunglasses
2020-01-19 16:35:47 +01:00
Ghom 4a0c85e0c0 Merge pull request #10594 from chefferz/chefferz-abductor1
Removes shrink rays from abductor console.
2020-01-19 16:12:51 +01:00
CitadelStationBot cd47e81b18 Automatic changelog generation for PR #10547 [ci skip] 2020-01-19 08:33:33 -06:00
Ghom 637e26eec9 Merge pull request #10547 from Putnam3145/one-more-dojo-tweak
Makes ghost dojo mobs dust if they're dead and ghostless
2020-01-19 15:33:30 +01:00
Putnam cc1fcee4ac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak 2020-01-19 03:56:41 -08:00
Putnam 1bdb515592 made suicide a config flag 2020-01-19 03:44:45 -08:00