Commit Graph

1496 Commits

Author SHA1 Message Date
necromanceranne 6ebc911937 Batons knockdown and slowdown on rightclick, otherwise they stagger, but always do damage. Damage respects melee armor, but power cells grant armor pen based on max charge. 2021-03-16 04:48:55 +11:00
silicons 5472186bc2 Merge pull request #14398 from LetterN/post-hardsync1.5
post-hardsync1.5
2021-03-14 23:30:26 -06:00
Letter N 935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
Letter N 59a725c25a icon(s) fixes and fixes boards 2021-03-10 11:26:33 +08:00
silicons 58b69786c8 Merge pull request #14358 from Hatterhat/femur-breakies
femur breaker actually breaks legs any%
2021-03-09 00:18:41 -07:00
Putnam 652398be4d i forgot i renamed this 2021-03-08 15:25:51 -08:00
Putnam cc360288bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-08 14:46:46 -08:00
Letter N 22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
Hatterhat 9b2d62b9ef whoops again 2021-03-02 22:09:38 -06:00
Hatterhat dc5ca7a556 oops 2021-03-02 22:07:13 -06:00
Hatterhat 053f9ea857 any% 2021-03-02 22:06:57 -06:00
keronshb b105556603 No Superconductivity with Reinforced Plasma Glass
Removes heat going through RPlasma Glass
2021-03-02 21:45:36 -05:00
Putnam f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -08:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
Timothy Teakettle b2015e4c94 blacklist 2021-02-21 17:32:07 +00:00
timothyteakettle deb1a5374d Update ghost_role_spawners.dm 2021-02-20 00:33:57 +00:00
timothyteakettle d34c821db4 Update ghost_role_spawners.dm 2021-02-19 23:45:01 +00:00
Timothy Teakettle a444918936 Update ghost_role_spawners.dm 2021-02-19 23:11:41 +00:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N 6286d40082 code works 2021-02-12 17:26:08 +08:00
Letter N 834e4730b3 not existing 2021-02-09 15:44:49 +08:00
Letter N f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
Putnam 6faf6af961 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-29 16:31:01 -08:00
raspy-on-osu 622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Putnam 51100c9bf9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-20 18:38:52 -08:00
Letter N 021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Putnam 158dd11d8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-19 17:52:40 -08:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons 1df2257e61 Merge pull request #14052 from SiliconMain/baitbegone
Update engineering.dm
2021-01-13 22:43:01 -07:00
SiliconMain cccb547a72 Update engineering.dm 2021-01-13 23:41:49 -06:00
silicons bcb2e16cef Merge pull request #14035 from SiliconMain/baitbegone
Comments out hololocks
2021-01-13 16:53:01 -07:00
SiliconMain 2d3e24fee4 Update engineering.dm 2021-01-12 14:43:54 -06:00
silicons 9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons 656691912e Merge pull request #13965 from Xantholne/GoodNightDisky
Good Night Disky
2021-01-09 15:39:06 -07:00
silicons bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08:00
silicons ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Putnam 186bb483b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-06 23:55:24 -08:00
MrJWhit abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
Xantholne 18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
Xantholne fe4f184792 good night disky 2021-01-04 03:50:43 -07:00
Timothy Teakettle 813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
silicons da25c48b2c Merge pull request #13855 from Chiirno/paramedBoxOffice
Paramed office on box + Surgery remodel
2020-12-29 01:27:49 -07:00
Letter N ce5ab2f3a4 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-28 09:35:58 +08:00
Timothy Teakettle c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
raspy-on-osu 0e652cb64c init 2020-12-26 06:02:09 -05:00
silicons bff30f587b sigh 2020-12-23 09:16:16 -07:00
Chiirno 35896e92ec Paramedic office added and operating room remodeled 2020-12-22 21:50:22 -04:00