cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 03:12:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,473 Commits 8 Branches 26 Tags
c82722cdbf18f4ebfc363e6713e1cbccc8caeb93
Commit Graph

34803 Commits

Author SHA1 Message Date
Heroman
c82722cdbf Ports fixes from Polaris early 2019-07-30 05:23:32 +10:00
Spades
2ab5a99089 Merge pull request #5517 from mistyLuminescence/spice 
Request Spice
 2019-07-29 15:15:11 -04:00
Spades
04b98813fc Merge pull request #5509 from Heroman3003/dirt-nerf 
Restricts random dirt spawning to plating tiles
 2019-07-29 15:13:54 -04:00
Spades
85f2f6d16e Merge pull request #5475 from Sebbe9123/Awoospeak 
Adds cursed speak autohiss
 2019-07-29 15:09:37 -04:00
Heroman
64ee0d757a Fixes default teshari tails not matching color of body 2019-07-29 09:24:10 +10:00
Novacat
179a4b4127 Merge pull request #5496 from Mewchild/MC-DarkBar 
Adds the Dark Bar to the Tether
 2019-07-28 14:19:48 -04:00
Novacat
044e74f69b Merge pull request #5530 from VOREStation/upstream-merge-6349 
[MIRROR] Fixes the metamorphic glass sprite for the B-52
 2019-07-28 14:18:41 -04:00
Anewbe
41871ab937 Merge pull request #6351 from Heroman3003/fixthe3 
Fixes 3 appearing to blind people when surgery table is used
 2019-07-28 14:00:26 -04:00
Anewbe
ffeb6ba7eb Merge pull request #6349 from MagmaRam/b52fix 
Fixes the metamorphic glass sprite for the B-52
 2019-07-28 14:00:16 -04:00
Novacat
50136a254c Merge pull request #5510 from VOREStation/upstream-merge-6303 
[MIRROR] Combat Mechs Can Punch More Things
 2019-07-27 17:40:22 -04:00
Heroman
efb81f45fc Fixes merge errors 2019-07-28 07:08:18 +10:00
Novacat
957fc2f17f Merge pull request #5515 from Heroman3003/minermechfix 
Fixes picking up ore while drilling with mechs
 2019-07-27 16:29:52 -04:00
Novacat
8f00834eb8 Merge pull request #5526 from VOREStation/upstream-merge-6324 
[MIRROR] Adds Laser Tag Turrets Plus Changes
 2019-07-27 16:26:30 -04:00
Novacat
83a2cb7490 Merge pull request #5525 from VOREStation/upstream-merge-6331 
[MIRROR] Makes Husking Require More Burn
 2019-07-27 16:24:49 -04:00
Novacat
fad621705a Merge pull request #5524 from VOREStation/upstream-merge-6334 
[MIRROR] New Clothing & Sweaters
 2019-07-27 16:24:32 -04:00
Novacat
6a639e7ae6 Merge pull request #5522 from VOREStation/upstream-merge-6329 
[MIRROR] Adds Specialized SMES Coils to Suppy Console
 2019-07-27 16:23:33 -04:00
Novacat
4acaf192e4 Merge pull request #5521 from VOREStation/upstream-merge-6330 
[MIRROR] Fixes fishing vendor's name
 2019-07-27 16:23:20 -04:00
Novacat
9b0c54b513 Merge pull request #5520 from VOREStation/upstream-merge-6325 
[MIRROR] Fixes Repairing Bots
 2019-07-27 16:23:08 -04:00
Novacat
79eb2e57a5 Merge pull request #5519 from VOREStation/upstream-merge-6347 
[MIRROR] Cyborgs Can See and Repair Holes in Ceiling
 2019-07-27 16:22:49 -04:00
Heroman
231b029bb2 Removes Polaris-level changes 2019-07-28 05:53:49 +10:00
Andrew
69ed422019 Adds Laser Tag Turrets Plus Changes (#6324) 
* Adds Laser Tag Turrets

* Adds changelog

* Reverts Lethal Turrets Shooting to Kill

* Small No Longer Means Misc Life

* Revert "Merge branch 'master' into Turret"

This reverts commit 0300e6723b1aec0c47f8f82f7db770aa29af2483, reversing
changes made to 219348783d49b3205c3ed64bdd604f61791e6e72.

* Revert "Revert "Merge branch 'master' into Turret""

This reverts commit ca3d13b3372f2c5587d8d2cc449a6da8503494e4.

* Github why

* Change laser.dm to master?

* Revert "Change laser.dm to master?"

This reverts commit da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9.
 2019-07-27 15:45:58 -04:00
Atermonera
d464d5560d Merge pull request #6331 from Nalarac/patch-4 
Makes Husking Require More Burn
 2019-07-27 15:10:26 -04:00
Atermonera
de27063ae1 Merge pull request #6334 from Schnayy/clothingpack1 
New Clothing & Sweaters
 2019-07-27 15:09:11 -04:00
if there were two guys on the moon
e51356209e 10 min CD 2019-07-27 19:21:21 +01:00
Andrew
b30f9ffd0f Adds Specialized SMES Coils to Suppy Console (#6329) 
* Adds Specialized SMES Coils to Suppy Console

The capacitance and transmission coils are order-able for 90 points in the engineering section. (Standard coil is 75)

* Adds changelog
 2019-07-27 13:11:34 -04:00
Anewbe
10c76b2476 Merge pull request #6330 from Heroman3003/capitalf 
Fixes fishing vendor's name
 2019-07-27 13:08:16 -04:00
Andrew
9d4f42ca29 Fixes Repairing Bots (#6325) 
* Fixes Repairing Bots

You can now repair beepsky, slime securitrons, and other bots if they get damaged

* Can Fix Emag

* Updates changelog

* fix rcsadd to rscadd
 2019-07-27 13:08:06 -04:00
Andrew
e6f54d671a Cyborgs Can See and Repair Holes in Ceiling (#6347) 
* Cyborgs Can See and Repair Holes in Ceiling

* Adds changelog because I keep forgetting
 2019-07-27 13:06:52 -04:00
Anewbe
07811148c3 Merge pull request #6343 from Nalarac/Circuits 
Fixes Integrated Circuit Printer Taking Fractions of a Sheet
 2019-07-27 13:06:42 -04:00
if there were two guys on the moon
bd9c75327c Request Spice 2019-07-27 17:04:21 +01:00
Heroman
30f0803cc4 Fixes picking up ore while drilling with mechs 2019-07-27 14:02:19 +10:00
Novacat
2f5957ee9f Merge pull request #5513 from chaoko99/custom-Aikacoat 
adds chaoko99's custom item
 2019-07-26 14:47:24 -04:00
chaoko99
ca099753a4 adds chaoko99's custom item 2019-07-25 20:59:44 -07:00
Andrew
e4deaa6478 Combat Mechs Can Punch More Things (#6303) 
* Combat Mechs Can Punch More Things

Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage).

Gives punching objects a check so you don't accidently smash something without meaning to.

Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs.

* Take_Damage Boogaloo

* More take_damage Stuff

Adds click delay on attacking barriers.
Proper noises when attacking material doors and barricades.

More stuff can be broken by mech punch and simple mobs.

* Adds changelong

* usr to user
 2019-07-24 17:00:24 -04:00
Heroman
2a1ffcafd8 Restricts random dirt spawning to plating tiles 2019-07-24 20:45:18 +10:00
Novacat
4c71587410 Merge pull request #5499 from Heroman3003/accesseningfr 
Fixes hardsuit crates not using one_access
 2019-07-24 06:25:02 -04:00
Novacat
3fcc7e1465 Merge pull request #5500 from VOREStation/upstream-merge-6285 
[MIRROR] Adds the SLED.
 2019-07-24 06:24:34 -04:00
Novacat
e33c50c506 Merge pull request #5504 from VOREStation/upstream-merge-6323 
[MIRROR] Makes roundstart dirt work more properly
 2019-07-24 06:18:08 -04:00
Novacat
a713ce2ff5 Merge pull request #5503 from VOREStation/upstream-merge-6304 
[MIRROR] Adds Ripley Speedboost Equipment
 2019-07-24 06:17:54 -04:00
Atermonera
8fa3d28529 Merge pull request #6323 from Heroman3003/dirtining 
Makes roundstart dirt work more properly
 2019-07-24 00:38:46 -04:00
Atermonera
f0311ed4ff Merge pull request #6304 from Nalarac/Mecha2 
Adds Ripley Speedboost Equipment
 2019-07-24 00:02:48 -04:00
Atermonera
f519272525 Merge pull request #6290 from Mechoid/SubMunitions 
Adds Submunition projectiles, and a laser gun showcasing them.
 2019-07-23 23:35:05 -04:00
Atermonera
a6d7c4ee81 Merge pull request #6285 from Mechoid/SLED 
Adds the SLED.
 2019-07-23 16:21:42 -04:00
Heroman
e4aae2a5a3 Fixes hardsuit crates not using one_access 2019-07-24 04:58:59 +10:00
Novacat
8a370584c5 Merge pull request #5497 from Heroman3003/maybeafix 
A stray attempt at fixing the lacking manifest entries
 2019-07-22 22:40:11 -04:00
Heroman
bf352acb09 A stray attempt at fixing the lacking manifest entries 2019-07-23 11:16:30 +10:00
Mewchild
e50c9642e6 Adds maint door, replaces alien tables, adds air alarm and missing APCs 2019-07-22 20:15:30 -05:00
Heroman
3e9afe908c Adds admin logging for usage of Eat Trash 2019-07-23 09:16:07 +10:00
Novacat
e90ba13352 Merge pull request #5494 from VOREStation/upstream-merge-6316 
[MIRROR] Makes rigpieces phoron immune
 2019-07-22 13:03:31 -04:00
Novacat
6ff5405b0a Merge pull request #5493 from VOREStation/upstream-merge-6320 
[MIRROR] Allows Multiple Light Printing in Autolathe
 2019-07-22 13:03:08 -04:00