Commit Graph

34360 Commits

Author SHA1 Message Date
Novacat
e01db9b517 Update telecomunications.dm 2019-04-29 00:10:13 -04:00
Neerti
0d76e09b7c Shortwave and Relay Tweaks 2019-04-29 00:02:13 -04:00
Unknown
32ae85e423 Fixes oversights with last PRs 2019-04-28 23:28:19 -04:00
Novacat
797f9dee59 Merge pull request #5115 from InterroLouis/Webbing-Cost
Changes Webbing Cost
2019-04-28 22:57:41 -04:00
Novacat
fb52ec08c6 Merge pull request #5114 from Novacat/nova-weapons
Expedition Sub-department
2019-04-28 22:57:13 -04:00
Unknown
1b7bab5810 Conflict Resolution Four 2019-04-28 22:37:49 -04:00
Unknown
7b9c155511 Conflict Resolution Part Three 2019-04-28 22:19:44 -04:00
Novacat
4c34013856 Conflict Resolution Part Two 2019-04-28 22:15:58 -04:00
Unknown
1f9eb87849 Conflict Resolution Part One 2019-04-28 22:14:31 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Neerti
cf1588441f Merge pull request #6139 from Mechoid/FixACTDStuff
Fixes Access Code Transmission Device oversight.
2019-04-28 20:12:14 -04:00
Novacat
b9a1fa29d6 Merge pull request #5111 from Heroman3003/people-cant-have-nice-things
Removes glucose autoinjectors from vendomats, makes Zaddat spawn with a bunch
2019-04-27 22:49:53 -04:00
Novacat
76bf550299 Merge pull request #5146 from VOREStation/upstream-merge-6129
[MIRROR] Allows liquidfoods to be eaten through protective gear
2019-04-27 22:49:20 -04:00
Novacat
cda7fc3156 Merge pull request #5148 from VOREStation/upstream-merge-6137
[MIRROR] Removes Resident from the Southern Cross
2019-04-27 22:45:06 -04:00
Novacat
958a5b6645 Merge pull request #5142 from VOREStation/upstream-merge-6058
[MIRROR] Removes umbrella permastuns. Adds wind mechanics.
2019-04-27 22:42:42 -04:00
Novacat
73b3b4c7b0 Update snacks.dm 2019-04-27 22:37:49 -04:00
Novacat
2f4c8a8ce1 Update assistant.dm 2019-04-27 22:35:05 -04:00
Novacat
536d209e29 Update civilian.dm 2019-04-27 22:33:06 -04:00
Novacat
a9aaebe465 Conflict Resolution 2 2019-04-27 22:23:20 -04:00
Novacat
2672e10dc4 Conflict Resolution 2019-04-27 21:28:06 -04:00
Anewbe
13ccd7533f Removes Resident from the Southern Cross 2019-04-27 21:05:10 -04:00
Atermonera
8f3f8ad80f Allows liquidfoods to be eaten through protective gear 2019-04-27 19:54:46 -04:00
Atermonera
31a79f0c28 Merge pull request #6068 from Mechoid/WhatWasWillBe
Re-adds the Space Worm.
2019-04-26 19:33:43 -04:00
Atermonera
9ea820fd7f Merge pull request #6058 from Neerti/permastuns_are_bad
Removes umbrella permastuns. Adds wind mechanics.
2019-04-26 19:32:29 -04:00
Novacat
589dbd69de Merge pull request #5135 from Novacat/nova-heterochromia
Adds Subtle Teleporter
2019-04-26 15:16:47 -04:00
Unknown
d9ec13eaf8 Purges expired permits 2019-04-26 00:08:01 -04:00
Novacat
ad3e9fc6bd Merge pull request #5101 from Heroman3003/timeclock-finishing
Implements switching on/off duty midround via timeclock terminals
2019-04-25 21:11:07 -04:00
Novacat
18c63cfab6 Merge pull request #5100 from Novacat/nova-survival
Tether Wilderness Adjustments
2019-04-25 21:10:46 -04:00
Unknown
62295136f3 Changes Engineering to LHS 2019-04-25 20:09:09 -04:00
Unknown
729b1fc662 Changes off Duty ID Aesthetics 2019-04-25 19:56:47 -04:00
Novacat
13321379b4 Merge pull request #5140 from VOREStation/upstream-merge-6118
[MIRROR] Ports Baystation's SS Debugging
2019-04-25 17:15:10 -04:00
Novacat
a2507d900d Merge pull request #5139 from VOREStation/upstream-merge-6131
[MIRROR] Fixes a typo in nurse spider ai code
2019-04-25 17:12:39 -04:00
Neerti
9c6886395a Merge pull request #6118 from Novacat/nova-alerts
Ports Baystation's SS Debugging
2019-04-25 17:03:43 -04:00
Neerti
ad51d60531 Merge pull request #6131 from Heroman3003/nurse-two
Fixes a typo in nurse spider ai code
2019-04-25 17:02:30 -04:00
Neerti
d3be46f669 Merge pull request #6132 from Heroman3003/fix-ai-target-priority
Fixes ai priority targeting
2019-04-25 17:01:13 -04:00
Unknown
a646af0c4c Stops infinite loop 2019-04-24 20:53:32 -04:00
Unknown
4f70cf5865 I did a stupid 2019-04-24 20:26:12 -04:00
Unknown
f21c5e4430 Adds Subtle Teleporter
It is also a structure, which should make it easier to use in buildmode. Current uses vanilla portal sprite.
2019-04-24 20:20:51 -04:00
Anewbe
b01c0bb40c Merge pull request #6126 from Heroman3003/phoronguard
Fixes some items having item_flag PHORONGUARD
2019-04-24 17:13:17 -04:00
Novacat
3d4333a405 Merge pull request #5132 from Novacat/nova-aifixes
Adds hostile NPC shadekin
2019-04-24 16:36:38 -04:00
Novacat
69d2d01c02 Conflict Resolution 2019-04-24 15:36:07 -04:00
Atermonera
44fd128ec5 Xenobio Slimes Grudge Promethean Attackers 2019-04-24 15:30:43 -04:00
Unknown
8fef0c5045 Survival Kits for Off Duty Explorers
...I love those things too much.
2019-04-24 14:00:11 -04:00
Unknown
57f92df2ea Adds hostile NPC shadekin
By staff request.
2019-04-24 13:00:33 -04:00
Novacat
6ad6879574 Merge pull request #5130 from Heroman3003/a-kin-fixing
Fixes shadekin feeling the burn
2019-04-24 11:50:43 -04:00
Novacat
37ede97410 Merge pull request #5131 from Heroman3003/micromaking
Fixes gripper being unable to hold micromech parts
2019-04-24 11:50:29 -04:00
Heroman
7c3181e599 Fixes gripper being unable to hold micromech parts 2019-04-24 20:53:17 +10:00
Heroman
5a93f11054 Fixes shadekin feeling the burn 2019-04-24 19:36:45 +10:00
Novacat
cd022ca990 Merge pull request #5113 from Heroman3003/ka-holsters
Adds KA holster to mining vendor
2019-04-24 01:27:58 -04:00
Neerti
c054354fb0 Merge pull request #6130 from Heroman3003/gamemode-fixes
Fixes gamemode checking list itself, instead of entries
2019-04-23 05:21:19 -04:00