cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,710 Commits 7 Branches 0 Tags
a6cda4268a3f51bc2cf76e62ad28d136e22ef17d
Commit Graph

15832 Commits

Author SHA1 Message Date
Novacat
df9f9fff42 Merge pull request #5634 from Heroman3003/grenadefix 
Restricts station use of manhack grenades and seismic charges
 2019-08-19 16:57:04 -04:00
Novacat
66967f6d02 Merge pull request #5617 from Novacat/nova-shuttle 
New Expedition Shuttle
 2019-08-19 16:56:51 -04:00
Heroman
6e8f35d80d Fixes roundstart runtime 2019-08-19 10:10:54 +10:00
Heroman
b2f3cc9bb5 Fixes borgs showing up in manifest in Misc category if they spawned roundstart 2019-08-18 09:37:17 +10:00
Heroman
4b0cc1810e Fixes a typo 2019-08-18 05:34:13 +10:00
Heroman
e0138738f4 Limits new equipment properly 2019-08-17 12:35:44 +10:00
Unknown
98fd57ae3c Final touches 2019-08-15 23:18:05 -04:00
Heroman
3e9456125a Restricts friendly manhack grenades to offstation use 2019-08-15 20:12:59 +10:00
Anewbe
f758d8fb38 Merge pull request #6381 from Nalarac/CableLayer2 
Fixes Mech Cable Layer
 2019-08-12 16:33:41 -04:00
Atermonera
c9e9932182 Merge pull request #6386 from TheFurryFeline/TFF-Orange_Is_The_New_Orange 
Freebie Orange Jumpsuit
 2019-08-12 14:40:23 -04:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Atermonera
e60f0daf47 Merge pull request #6295 from Mechoid/TTS_And_Sign 
Adds an advanced TTS circuit, and sign-camera.
 2019-08-05 18:52:48 -04:00
Atermonera
f863fa8f7f Merge pull request #6357 from Michiyamenotehifunana/HanalSprites 
Resprites Health Analyzers and Adds Scanning Animations
 2019-08-04 17:21:03 -04:00
Novacat
c2463fc02b Merge pull request #5528 from Heroman3003/demotion 
Replaces "Terminated" with "Dismissed" as default rank removal
 2019-08-03 08:41:50 -04:00
Heroman
a8e3b1e270 Replaces Terminated with Dismissed as default rank removal 2019-08-03 21:59:56 +10:00
Spades
f15c7cd16e Merge pull request #5514 from CameronWoof/medical-sprites 
Resprites Advanced Burn and Trauma Kits
 2019-08-03 07:51:27 -04:00
Spades
4ce97f4a6e Merge pull request #5478 from mistyLuminescence/defib 
Defib Scanners
 2019-08-03 07:51:14 -04:00
Anewbe
7977f50b1c Merge pull request #6359 from Nalarac/patch-5 
Updates Supermatter Guide Book
 2019-08-02 14:06:45 -04:00
Novacat
d5b416f70b Merge pull request #5542 from VOREStation/upstream-merge-6328 
[MIRROR] Makes Heavy-Duty Cell Chargers Constructable
 2019-07-31 02:10:06 -04:00
Novacat
dc9d475725 Update recharger.dm 2019-07-31 01:46:21 -04:00
Novacat
f03ec2fbe8 Update recharger.dm 2019-07-31 01:45:15 -04:00
Novacat
7b4701f1d8 Merge pull request #5543 from VOREStation/upstream-merge-6354 
[MIRROR] Adds proper miss chance for stabbing people in the eyes.
 2019-07-30 20:29:53 -04:00
Atermonera
a175e70865 Merge pull request #6354 from MagmaRam/eyestabs 
Adds proper miss chance for stabbing people in the eyes.
 2019-07-30 20:19:46 -04:00
Atermonera
35e0eeec78 Makes Heavy-Duty Cell Chargers Constructable 2019-07-30 20:18:33 -04:00
Atermonera
60c415cf64 Adds shutoff valve monitor 2019-07-30 20:04:51 -04:00
Novacat
d844f233c4 Merge pull request #5508 from VOREStation/upstream-merge-6279 
[MIRROR] Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.
 2019-07-30 19:50:02 -04:00
Heroman
54be18505b Removes the leaks and related mechanics 2019-07-31 09:25:07 +10:00
Heroman
fea0c9954d Adds missing //Vorestation Edit 2019-07-30 05:38:29 +10:00
Heroman
c82722cdbf Ports fixes from Polaris early 2019-07-30 05:23:32 +10: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
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
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
Heroman
0bc5d5b3ba Replaces Termination with Demotions as default rank removal 2019-07-28 06:46:05 +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
4acaf192e4 Merge pull request #5521 from VOREStation/upstream-merge-6330 
[MIRROR] Fixes fishing vendor's name
 2019-07-27 16:23:20 -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
Anewbe
10c76b2476 Merge pull request #6330 from Heroman3003/capitalf 
Fixes fishing vendor's name
 2019-07-27 13:08:16 -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
CameronWoof
172314f04c more compliance 2019-07-26 23:43:11 -07:00
CameronWoof
2cd2b7a981 code compliance 2019-07-26 23:10:41 -07:00
Heroman
30f0803cc4 Fixes picking up ore while drilling with mechs 2019-07-27 14:02:19 +10:00
CameronWoof
1aca0bff38 Resprites Advanced Burn and Trauma Kits 2019-07-26 20:13:09 -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
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
Mechoid
5864447d5d Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my. (#6279) 
* Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.

* Fix processing fuckery.

* Deal with Forever-Seals, and Infini-clamps.

* Update clamp.dm
 2019-07-24 04:46:28 -04:00