Commit Graph

15632 Commits

Author SHA1 Message Date
Novacat
6a287c7e1f Merge pull request #5085 from VOREStation/upstream-merge-6026
[MIRROR] Precursotech Janus
2019-04-18 02:19:31 -04:00
Novacat
ab7a0305f7 Conflict Resolution 2019-04-18 02:00:59 -04:00
Mechoid
fc43527ac7 Adds Robobags (#6059)
* Adds Robobags

* Finishes robobags

* FixFix
2019-04-18 01:40:39 -04:00
Atermonera
b7e9934206 Precursotech Janus 2019-04-18 00:33:20 -04:00
Neerti
f15c5bf29b Merge pull request #6095 from Heroman3003/unduping-synths
Fixes synthesisers inserting more materials than they had
2019-04-17 02:36:46 -04:00
Neerti
860ff31f08 Merge pull request #6094 from Heroman3003/anti-magic-markers
Fixes markers and crayons drawing from a distance
2019-04-16 23:09:02 -04:00
Novacat
01a7f1083b Merge pull request #5080 from VOREStation/upstream-merge-6092
[MIRROR] Fixes fireaxe cabinets
2019-04-16 22:48:01 -04:00
Neerti
3f7d2a0450 Fixes fireaxe cabinets 2019-04-16 22:00:42 -04:00
Heroman3003
fed6680ddf Fixes cryopod not allowing people to change their mind 2019-04-17 11:25:56 +10:00
Novacat
b597e89447 Merge pull request #5064 from VOREStation/upstream-merge-6087
[MIRROR] Fixes some bugs related to buckling
2019-04-15 18:44:24 -04:00
Novacat
2fa26d319c Merge pull request #5063 from VOREStation/upstream-merge-6086
[MIRROR] Fixes self-refueling welders starting fires when off
2019-04-15 18:41:31 -04:00
Neerti
88d095cf11 Merge pull request #6087 from Heroman3003/pipe-buckle-general
Fixes some bugs related to buckling
2019-04-15 18:32:51 -04:00
Neerti
197bedb2eb Merge pull request #6086 from Heroman3003/welder-fires
Fixes self-refueling welders starting fires when off
2019-04-15 18:31:37 -04:00
Neerti
99444fa0c8 Merge pull request #6085 from Heroman3003/apc-cost-fix
Fixes apc frame giving more steel than needed
2019-04-15 18:29:58 -04:00
Neerti
0c2703b705 Merge pull request #6082 from Heroman3003/sleeper-a-roo
Fixes several issues with sleepers
2019-04-14 19:55:20 -04:00
Neerti
28c7e4c0c4 Merge pull request #6066 from Heroman3003/request-relabeling
Allows the request console ID to actually be changed
2019-04-14 02:30:54 -04:00
Novacat
f391ddad02 Merge pull request #5038 from VOREStation/upstream-merge-6028
[MIRROR] Precursotech Tools
2019-04-14 02:29:25 -04:00
Novacat
47dac87f75 Merge pull request #5037 from VOREStation/upstream-merge-6027
[MIRROR] Anomalotech Charge Sword
2019-04-14 02:22:02 -04:00
Neerti
9c28b82c6c Merge pull request #6028 from Mechoid/Precursotech_Tools
Precursotech Tools
2019-04-14 02:20:07 -04:00
Neerti
94e6cc402b Merge pull request #6027 from Mechoid/Precursotech_Sword
Anomalotech Charge Sword
2019-04-14 01:21:05 -04:00
Neerti
d2cb1f67a3 Merge pull request #6024 from Mechoid/Precursotech_Sleepers
Precurso / Anomalotech Sleepers
2019-04-14 01:16:46 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Neerti
098f8851ad Arrivals Power Fix 2019-04-13 17:34:31 -04:00
Zap-zapper
acc9897320 Size control implant fix 2019-04-13 18:42:53 +07:00
Heroman3003
dc78210333 Allows cyborgs and AIs to appear in character directory 2019-04-12 10:55:53 +10:00
Heroman3003
2496116d92 Fixes NSFW batteries not being rechargable 2019-04-12 08:53:51 +10:00
Novacat
ab5710a015 Merge pull request #4881 from Heroman3003/borg-resization
Borgs are now in on fun of size-related features
2019-04-11 12:35:21 -04:00
Novacat
c1d44a008a Merge pull request #4966 from Novacat/nova-survival
Rosettes, radiopack sprites
2019-04-10 19:46:09 -04:00
Novacat
5eca66e042 Update door.dm 2019-04-09 22:25:16 -04:00
Neerti
e1cce77f60 Fixes ability to repair doors for bogs/drones 2019-04-09 17:47:13 -04:00
Novacat
cc0893409f Merge pull request #4960 from Heroman3003/telenommening
Fixes telenoms via command teleporter, fixes command teleporter sprites
2019-04-08 19:15:58 -04:00
Novacat
f7f1ba0d90 Merge pull request #4971 from Heroman3003/door-friends
Fixes the door repair and reinforcing for borgs and drones
2019-04-08 19:10:42 -04:00
Heroman3003
a0030dc15f Fixes borg/drone door repair/reinforcement 2019-04-09 08:23:08 +10:00
Heroman
261e71f34a Weird hooks, no vorestation edits 2019-04-09 07:14:55 +10:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Unknown
5e9ac3f00d Rosettes, radiopack sprites
- Adds Rosettes and Colorable Rosettes
- Adds on mob sprite for the subspace radio
2019-04-08 14:07:24 -04:00
Novacat
cfafae3513 Merge pull request #4956 from Heroman3003/recursive-safety
Fixes players in players being totally purged during despawning
2019-04-08 12:57:38 -04:00
Novacat
8a20635d9e Merge pull request #4961 from Heroman3003/un-soul-voring
Fixes portals being able to send ghosts and other technical mobs
2019-04-08 07:59:38 -04:00
Heroman
141f7e649a Fixes non-mob mobs being able to use portals 2019-04-08 20:42:59 +10:00
Heroman
ea1a6cfcf8 Fixes command teleporter sprites 2019-04-08 20:27:00 +10:00
Heroman
148511e6b0 Fixes some issues with BSH 2019-04-08 16:34:36 +10:00
Heroman
315dabc9aa Fixes players in players being totally purged during despawning 2019-04-08 15:55:10 +10:00
Heroman
18e00b3617 Fixes micromechs using normal equipment 2019-04-08 06:16:53 +10:00
Heroman
9a2bcce710 Removes ability for non-player mice to open doors 2019-04-07 10:00:25 +10:00
Novacat
f73a757152 Merge pull request #4924 from VOREStation/upstream-merge-6025
[MIRROR] Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
2019-04-06 14:56:27 -04:00
Unknown
c4860391b6 Conflict Resolution 2019-04-06 14:47:21 -04:00
Novacat
2be62bd672 Merge pull request #4922 from Novacat/nova-survival
Post-release Bugfixing
2019-04-06 13:50:00 -04:00
Unknown
0482da8c52 Ports two polaris bugfix PRs early 2019-04-06 12:21:24 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Neerti
b9b14144b0 Merge pull request #6036 from PrismaticGynoid/butchershack
Butcher shack PoI
2019-04-06 05:00:42 -04:00