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

7976 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
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
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
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
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
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
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
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
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
Anewbe
03ff9fa0fe Merge pull request #6284 from Atermonera/weather_app_atmos_reading 
fixes communicator weather app's air reading
 2019-07-19 16:19:36 -04:00
if there were two guys on the moon
2b155eb2a5 VSedit 2019-07-19 09:56:57 +01:00
if there were two guys on the moon
4baf7a58e7 VS edit 2019-07-19 09:29:02 +01:00
if there were two guys on the moon
f4f2d6bf08 defib 2019-07-19 09:24:07 +01:00
if there were two guys on the moon
d6891f3bb2 defib scanners 2019-07-19 09:07:55 +01:00
Novacat
d48861c7e3 Merge pull request #5469 from VOREStation/upstream-merge-6245 
[MIRROR] The great rock update.
 2019-07-14 01:36:40 -04:00
Novacat
d8c3d23e60 Merge pull request #5465 from VOREStation/upstream-merge-6272 
[MIRROR] Mining Expansion, the Diggening.
 2019-07-14 01:36:27 -04:00
Atermonera
22c5967269 The great rock update. 2019-07-13 18:21:45 -04:00
Atermonera
9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
Atermonera
9c8a3803ff Merge pull request #6294 from Heroman3003/plastic-unflap 
Makes airtight plastic flaps less of a free pass
 2019-07-12 02:52:51 -04:00
Atermonera
1472642b88 Merge pull request #6262 from Mechoid/CivilianExpansion1 
Civilian Expansion 1: The Plantening
 2019-07-07 17:29:32 -04:00
Heroman
706e75449d Makes trash pile components have random sprites. 2019-07-06 08:06:51 +10:00
Spades
5a7bdcebf4 Merge pull request #5378 from Novacat/nova-survival 
Minor Fixes
 2019-07-05 07:04:18 -04:00
Novacat
e679bac06b Merge pull request #5425 from VOREStation/upstream-merge-6266 
[MIRROR] Flashes actually work as said on the tin.
 2019-07-04 12:41:18 -04:00
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
1c6ff4f9fd Merge pull request #6263 from Nalarac/patch-6 
Nerfs Simple Doors
 2019-07-03 23:08:19 -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
Heroman
2965503cbd Adds new GPSs 2019-07-02 12:04:17 +10: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
Atermonera
4f601a94b8 Merge pull request #6248 from Heroman3003/gpsing 
Adds more GPS variety
 2019-07-01 20:47:22 -04:00
Atermonera
3d31a77514 Multi-Tile Objects, Multi-Tile Hovershuttle 2019-07-01 20:43:53 -04:00
Heroman
c11a1fc16e Fixes spawning of action figures in crates. 2019-07-01 06:49:27 +10:00
mistyLuminescence
c406672c26 Adds two new Cargo crates! 2019-06-29 19:46:41 -04:00