Commit Graph

46561 Commits

Author SHA1 Message Date
Unknown
a1bb30ddf8 Seriously? 2019-04-28 15:24:34 -04:00
Unknown
fb6c78317a Gives V2 Surface more points
More POIs, more Points.
2019-04-28 15:19:59 -04:00
Unknown
f8f6483469 Updates V2 POIs 2019-04-28 15:12:51 -04:00
Unknown
44094f2634 V4 POI Generation Fixes
POIs can only generate on half the map right now, and, not a particularly large half. This prevents the generation of larger POIs, and basically squishes all the POIs towards the cave entrance.
2019-04-28 14:04:43 -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
Unknown
53c297895a Updates Virgo 3B Weather 2019-04-27 22:32:05 -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
Novacat
c80b6146eb Merge pull request #5147 from VOREStation/upstream-merge-6138
[MIRROR] changelog
2019-04-27 21:16:01 -04:00
Anewbe
13ccd7533f Removes Resident from the Southern Cross 2019-04-27 21:05:10 -04:00
Anewbe
71d9669913 changelog 2019-04-27 21:03:55 -04:00
Atermonera
8f3f8ad80f Allows liquidfoods to be eaten through protective gear 2019-04-27 19:54:46 -04:00
Novacat
822e0f48d6 Merge pull request #5143 from VOREStation/upstream-merge-6068
[MIRROR] Re-adds the Space Worm.
2019-04-26 20:00:59 -04:00
VirgoBot
db5dd0ccc1 Re-adds the Space Worm. 2019-04-26 19:33:43 -04:00
Atermonera
31a79f0c28 Merge pull request #6068 from Mechoid/WhatWasWillBe
Re-adds the Space Worm.
2019-04-26 19:33:43 -04:00
VirgoBot
0fe71c0b59 Removes umbrella permastuns. Adds wind mechanics. 2019-04-26 19:32:29 -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
16e449ce1e Config-side expired permit purge 2019-04-26 14:58:49 -04:00
Spades
cd1958779c Merge pull request #5141 from Novacat/nova-survival
Purges expired permits
2019-04-26 00:17:07 -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
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
Novacat
a3d9935aec Merge pull request #5138 from VOREStation/upstream-merge-6132
[MIRROR] Fixes ai priority targeting
2019-04-25 17:11:15 -04:00
VirgoBot
f0b61889bb Ports Baystation's SS Debugging 2019-04-25 17:03:43 -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
VirgoBot
fcf22f8e1f Fixes a typo in nurse spider ai code 2019-04-25 17:02:30 -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
VirgoBot
b6ceb46b50 Fixes ai priority targeting 2019-04-25 17:01:13 -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
Novacat
c8f104bc2d Merge pull request #5134 from VOREStation/upstream-merge-6126
[MIRROR] Fixes some items having item_flag PHORONGUARD
2019-04-24 18:19:38 -04:00
VirgoBot
a9f9ffb009 Fixes some items having item_flag PHORONGUARD 2019-04-24 17:13:17 -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
d1f9edd81a Merge pull request #5133 from VOREStation/upstream-merge-6128
[MIRROR] Xenobio Slimes Grudge Promethean Attackers
2019-04-24 16:07:14 -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
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