Commit Graph
28776 Commits
Author SHA1 Message Date
CitadelStationBot ea04242a09 Automatic changelog generation for PR #10645 [ci skip] 2020-01-22 19:53:38 -06:00
GhomandGitHub 047059617c Merge pull request #10645 from r4d6/Modular-Lavaland
Modularize the mining base
2020-01-23 02:53:34 +01:00
GhomandGitHub 3ce27d6c36 Merge pull request #10638 from Hatterhat/patch-3
compact defibs have a properly set departmental flag now
2020-01-23 02:51:17 +01:00
CitadelStationBot 20604fd5b3 Automatic changelog generation for PR #10450 [ci skip] 2020-01-22 19:44:20 -06:00
GhomandGitHub 04811c9c22 Merge pull request #10450 from Citadel-Station-13/kevinz000-patch-8
(is this really a good idea) hitscan emitters
2020-01-23 02:44:17 +01:00
CitadelStationBot 78875eb80d Automatic changelog generation for PR #10622 [ci skip] 2020-01-22 19:41:21 -06:00
GhomandGitHub 4435bd4d56 Merge pull request #10622 from Owai-Seek/mojodojo
Ghost Cafe Cleanup
2020-01-23 02:41:18 +01:00
CitadelStationBot bcf579a44d Automatic changelog generation for PR #10606 [ci skip] 2020-01-22 19:40:56 -06:00
GhomandGitHub fcbc5149c4 Merge pull request #10606 from r4d6/patch-2
Update the Passive Vents that I added
2020-01-23 02:40:54 +01:00
r4d6 c78944c5bc Update 2020-01-22 13:47:57 -05:00
r4d6 e3cb379bde Add the Mining Base as a submap 2020-01-21 20:31:40 -05:00
CitadelStationBot 86c5d43a1b Automatic changelog generation for PR #10640 [ci skip] 2020-01-21 09:23:42 -06:00
GhomandGitHub 0985d1f1d0 Merge pull request #10640 from r4d6/mapfix
Map Fixes
2020-01-21 16:23:39 +01:00
r4d6 1ae106cca2 Fixes 2020-01-21 09:23:34 -05:00
kevinz000 ed5172f9ca changes 2020-01-20 23:17:58 -07:00
kevinz000 8f60d01208 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8 2020-01-20 22:47:21 -07:00
CitadelStationBot 25050d7bb6 Automatic changelog generation for PR #10619 [ci skip] 2020-01-20 20:37:44 -06:00
GhomandGitHub 8e49c99ca0 Merge pull request #10619 from Seris02/conveyor
conveyor updates
2020-01-21 03:37:42 +01:00
GhomandGitHub 3c53619f2a Merge pull request #10616 from Citadel-Station-13/kevinz000-patch-15
Renames created volume in pyrotechnics to multiplier to alleviate confusion
2020-01-21 03:05:22 +01:00
CitadelStationBot d7192f6944 Automatic changelog generation for PR #10468 [ci skip] 2020-01-20 19:26:28 -06:00
GhomandGitHub 7a3f0d140c Merge pull request #10468 from Citadel-Station-13/stop-ghosting
ghosting no longer makes it so you don't count for abductors
2020-01-21 02:26:25 +01:00
CitadelStationBot 437392e0d3 Automatic changelog generation for PR #10588 [ci skip] 2020-01-20 19:17:41 -06:00
GhomandGitHub c244f95ed9 Merge pull request #10588 from PersianXerxes/tweakEngieField
Reduces Forcefield Projector Range to Two Tiles
2020-01-21 02:17:38 +01:00
CitadelStationBot 9cb11b4414 Automatic changelog generation for PR #10608 [ci skip] 2020-01-20 19:13:32 -06:00
GhomandGitHub 4dd576a0ce Merge pull request #10608 from Citadel-Station-13/kevinz000-patch-12
PDA blocking
2020-01-21 02:13:30 +01:00
kevinz000 5abc1104c0 ok 2020-01-20 18:03:54 -07:00
kevinz000 221e05b3c8 add line 2020-01-20 17:58:58 -07:00
kevinz000 bb14b255d2 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-12 2020-01-20 17:51:56 -07:00
kevinz000 efe3ebdb53 bet 2020-01-20 17:50:07 -07:00
HatterhatandGitHub fae0d6fe3f remember when i hoped i didnt forget something 2020-01-20 18:06:07 -06:00
CitadelStationBot ad2db72b0d Automatic changelog generation for PR #10635 [ci skip] 2020-01-20 18:02:56 -06:00
GhomandGitHub 01080e2ab6 Merge pull request #10635 from Hatterhat/patch-2
removes det scanner from adv bio
2020-01-21 01:02:54 +01:00
HatterhatandGitHub 348fa8be86 salt pr @kevinz000 2020-01-20 17:27:51 -06:00
kevinz000andGitHub 0661bc2558 Update PDA.dm 2020-01-20 15:26:24 -07:00
CitadelStationBot a99090ddbf Automatic changelog generation for PR #10617 [ci skip] 2020-01-20 13:02:09 -06:00
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub b85e752e46 Merge pull request #10615 from keronshb/RemoteMoodResearch
Fixes the nanite sprites deleting the game sprites
2020-01-20 18:04:31 +01:00
kevinz000 051ca8c050 checks 2020-01-20 03:45:40 -07:00
Seris02 ab771d9505 I deleted an important thing 2020-01-20 15:48:55 +08:00
Winter Flare 3828c60367 Update CentCom.dmm
Towel Bins into Bedsheet Bins
2020-01-20 02:07:33 -05:00
CitadelStationBot 0f4f07dc95 Automatic changelog generation for PR #10346 [ci skip] 2020-01-20 00:11:05 -06:00
kevinz000andGitHub 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
Winter Flare 710eaa7fc0 Lighting + Carpet Locker fixes. 2020-01-20 01:06:02 -05:00
kevinz000 ecddef2f21 compile 2020-01-19 22:58:08 -07:00
Hatterhat 28a2cc4a3d .357 AP printable from illegal ballistics 2020-01-19 23:55:12 -06:00
0b10b8cf89 Update code/game/objects/items/devices/PDA/PDA.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-01-19 22:41:19 -07:00
Winter Flare c8b5c6e3cd Ghost Cafe Beautification
Added Vendors
Added Carpeting and Wood
Made Botany, Dorms, and Kitchen/Bar slightly larger.
Added Vendor Refills
Added a ton of Janitorial Stuff
Added a second set of showers.
Added more trashcans.
Added Ambrosia Gaia seeds.
Added Bedsheet + Towel Bins
Added one Slot Machine
Scattered around some Coins
2020-01-20 00:22:24 -05:00