cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,579 Commits 7 Branches 0 Tags
b5824871ed6e1fea1335c5ab3d093b4ea7db7974
Commit Graph

34868 Commits

Author SHA1 Message Date
Atermonera
c4c8457a82 Merge pull request #6266 from Mechoid/StopSecurityFromBlowingTheirTops_Flashfix2 
Flashes actually work as said on the tin.
 2019-07-03 23:10:55 -04:00
Atermonera
8952374cce Merge pull request #6264 from Heroman3003/awood 
Fixes alien wood issues
 2019-07-03 23:09:42 -04:00
Atermonera
b30b24450d Merge pull request #6265 from Heroman3003/camerafix 
Fixes technical cameras being affected by random event
 2019-07-03 23:09:33 -04:00
Atermonera
1c6ff4f9fd Merge pull request #6263 from Nalarac/patch-6 
Nerfs Simple Doors
 2019-07-03 23:08:19 -04:00
Novacat
0750406ae3 Merge pull request #5421 from VOREStation/upstream-merge-6254 
[MIRROR] Fixes farmbot infinite looping
 2019-07-03 14:10:46 -04:00
Novacat
78fc028dba Merge pull request #5420 from VOREStation/upstream-merge-6256 
[MIRROR] Fixes '1' message from MCs
 2019-07-03 13:54:17 -04:00
Novacat
74060aef32 Merge pull request #5419 from VOREStation/upstream-merge-6260 
[MIRROR] Properly splits security and engineering alarms
 2019-07-03 13:54:07 -04:00
Novacat
30d464e087 Merge pull request #5418 from VOREStation/upstream-merge-6261 
[MIRROR] Fixes atmosphere targeted mutation editing wrong plant traits
 2019-07-03 13:53:57 -04:00
Anewbe
61a95813c2 Merge pull request #6254 from Heroman3003/farmbotfix 
Fixes farmbot infinite looping
 2019-07-03 13:11:22 -04:00
Anewbe
f4feaf1363 Merge pull request #6256 from Heroman3003/fixtheone 
Fixes '1' message from MCs
 2019-07-03 13:11:12 -04:00
Anewbe
e08616f1ee Merge pull request #6260 from Heroman3003/alarmchange 
Properly splits security and engineering alarms
 2019-07-03 13:11:00 -04:00
Anewbe
02e1db9dfd Merge pull request #6261 from Heroman3003/botanfix 
Fixes atmosphere targeted mutation editing wrong plant traits
 2019-07-03 13:09:46 -04:00
Anewbe
8f1c86d473 Merge pull request #6259 from Heroman3003/flowerfix 
Fixes ppflowers having no icon sometiems
 2019-07-03 13:09:35 -04:00
Novacat
bcd2e28e65 Merge pull request #5413 from VOREStation/upstream-merge-6253 
[MIRROR] Fixes deconstructed wall frames blocking passage
 2019-07-02 12:53:16 -04:00
Anewbe
af61db3c77 Merge pull request #6253 from Heroman3003/invisible-wall-fix 
Fixes deconstructed wall frames blocking passage
 2019-07-02 08:29:16 -04:00
Anewbe
e223a8b4ad Merge pull request #6251 from Heroman3003/reactionfix 
Fixes retaliate mobs ignoring melee attacks
 2019-07-02 08:28:01 -04:00
Heroman
96ff9f43b9 And to exploration vendor too 2019-07-02 12:10:50 +10:00
Heroman
d0b9ab620a Adds mining GPS to mining vendor 2019-07-02 12:08:05 +10:00
Heroman
2965503cbd Adds new GPSs 2019-07-02 12:04:17 +10:00
Heroman
2b16679f78 Updates lighting to match new numbers 2019-07-02 11:28:09 +10:00
Novacat
1fd999075c Merge pull request #5408 from VOREStation/upstream-merge-6249 
[MIRROR] Makes lead icon display stack
 2019-07-01 21:09:51 -04:00
Novacat
e320d73188 Merge pull request #5407 from VOREStation/upstream-merge-6250 
[MIRROR] Allows to interact with turf itself in Turf tab
 2019-07-01 21:09:43 -04:00
Novacat
cf9986a2f2 Merge pull request #5406 from VOREStation/upstream-merge-6248 
[MIRROR] Adds more GPS variety
 2019-07-01 21:09:34 -04:00
Novacat
a56eb4e514 Merge pull request #5405 from VOREStation/upstream-merge-6247 
[MIRROR] Fixes runtime and GPS problem with invalid Z-levels
 2019-07-01 21:09:26 -04:00
Atermonera
9d207a28fd Merge pull request #6249 from Heroman3003/lead-stack 
Makes lead icon display stack
 2019-07-01 20:48:45 -04:00
Atermonera
02ea14d239 Merge pull request #6250 from Heroman3003/altclickup 
Allows to interact with turf itself in Turf tab
 2019-07-01 20:48:36 -04:00
Atermonera
4f601a94b8 Merge pull request #6248 from Heroman3003/gpsing 
Adds more GPS variety
 2019-07-01 20:47:22 -04:00
Atermonera
58c2b2311e Merge pull request #6247 from mistyLuminescence/zruntime 
Fixes runtime and GPS problem with invalid Z-levels
 2019-07-01 20:46:10 -04:00
Atermonera
3d31a77514 Multi-Tile Objects, Multi-Tile Hovershuttle 2019-07-01 20:43:53 -04:00
Novacat
75d6e509d2 Merge pull request #5399 from Heroman3003/figurefix 
Fixes spawning of action figures in crates.
 2019-06-30 20:22:54 -04:00
Anewbe
b820ac6844 Merge pull request #6246 from Heroman3003/lightfix 
Fixes construction of lights
 2019-06-30 19:40:15 -04:00
Heroman
c11a1fc16e Fixes spawning of action figures in crates. 2019-07-01 06:49:27 +10:00
Novacat
ce70e5b3a2 Merge pull request #5395 from VOREStation/upstream-merge-6194 
[MIRROR] Adds two new Cargo crates!
 2019-06-30 01:59:45 -04:00
Novacat
be853c735b Update security.dm 2019-06-29 22:38:46 -04:00
mistyLuminescence
c406672c26 Adds two new Cargo crates! 2019-06-29 19:46:41 -04:00
Anewbe
3da73d53f3 Merge pull request #6244 from Heroman3003/cargofix 
Fixes glucose crate spawning
 2019-06-29 19:26:57 -04:00
Anewbe
d731589ba0 Merge pull request #6238 from Heroman3003/broken-components 
QoL improvements for broken components
 2019-06-29 04:08:30 -04:00
Novacat
fb7b809aba Merge pull request #5390 from VOREStation/upstream-merge-6230 
[MIRROR] Adds two new alternate sprites for the detective's revolver.
 2019-06-28 21:41:25 -04:00
Novacat
a49fe3b8dd Merge pull request #5388 from VOREStation/upstream-merge-6236 
[MIRROR] Adds Precursor Tech to Research Debugging Device
 2019-06-28 21:39:59 -04:00
Novacat
0520590462 Merge pull request #5387 from VOREStation/upstream-merge-6235 
[MIRROR] Adds Material Scanner to Protolathe
 2019-06-28 21:39:48 -04:00
Novacat
2b332615d3 Merge pull request #5386 from VOREStation/upstream-merge-6233 
[MIRROR] Adds Industrial turrets, and an industrial teleporter defense turret.
 2019-06-28 21:39:33 -04:00
ElectricB1ue
d9ebf54db0 Adds two new alternate sprites for the detective's revolver. (#6230) 
* Adds the sprites

* This should do things.
 2019-06-28 21:23:42 -04:00
Anewbe
8c84811646 Merge pull request #6236 from Nalarac/patch-3 
Adds Precursor Tech to Research Debugging Device
 2019-06-28 21:22:19 -04:00
Andrew
586ad2906e Adds Material Scanner to Protolathe (#6235) 
* Adds Material Scanner to Protolathe

Adds the optical material scanner to the protolathe (the ones miners get).
Costs 50 steel and 50 glass (same as all the other HUDs)
Required tech is 3 magnet and 3 engineering (same as on the HUD)

Also adjusts the meson design so it actually uses its parent code like the other HUDs

* Changes sorting string
 2019-06-28 21:22:09 -04:00
Mechoid
9738ec903b Adds Industrial turrets, and an industrial teleporter defense turret. (#6233) 
* Starts work on retouching the Teleporter.

* Fix icon.
 2019-06-28 21:20:56 -04:00
Atermonera
bbb3201dc2 Merge pull request #6234 from Cerebulon/newsJune19 
Feb-June News Update
 2019-06-28 20:12:47 -04:00
Heroman
180d8e8df0 Standartizes _vr container definitions 2019-06-29 04:17:59 +10:00
Novacat
a8da295d6e Merge pull request #5379 from Heroman3003/teleport-fix 
Fixes quantum pad and telepad teleportations
 2019-06-28 12:36:55 -04:00
Anewbe
046f481825 Merge pull request #6231 from Heroman3003/ghostjumpfix 
Fixes ghost jump-to-mob
 2019-06-28 10:06:57 -04:00
Heroman
cbb37fdeb1 One more forgotten exception 2019-06-28 17:13:42 +10:00