cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,443 Commits 6 Branches 0 Tags
c3578b965869aa55b29fa8d10b7e35315b56375f
Commit Graph

139 Commits

Author SHA1 Message Date
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Atermonera
ea876b37cf Merge pull request #6476 from Hawk-v3/master 
Printers print Fields correctly now.
 2019-10-08 04:22:16 -04:00
TrilbySpaceClone
c1f2d35b13 Ill maintain this I sware! 2019-10-05 21:43:09 -04:00
Hawk_v3
1a360ed49c Printers print Fields correctly now. 
You're all welcome!
 2019-10-05 19:57:41 +01:00
Atermonera
0b31dcace5 Properly sorts all protolathe designs 2019-09-26 03:00:43 -04:00
Heroman
8872a08a1a Fixes bugs with suit sensors and tether levels 2019-08-17 09:24:57 +10: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
Heroman
0bc5d5b3ba Replaces Termination with Demotions as default rank removal 2019-07-28 06:46:05 +10: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
Heroman3003
ca13a8872c MC camera and access fixes and adjustments (#6269) 
* Adjusts MC camera program, fixes ID program

* Fixes oversight with network access
 2019-07-09 14:01:53 -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
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
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
Heroman
6c65828dd6 Fixes closing laptops with no proper support 2019-06-04 08:19:11 +10:00
Unknown
2071f9273e Allows Benches/Racks to support laptops 2019-05-27 12:15:51 -04:00
Unknown
34547c3282 Adds some differences for rugged laptops 2019-05-27 12:09:31 -04:00
Unknown
7515df6187 Another new sprite 2019-05-27 12:01:00 -04:00
Unknown
63fff025bb New Modular Computer Sprites 
- New laptop sprite, currently only used for the elite model
- New console sprite that matches pre-existing consoles

Also fixes a bug with Pathfinder spawning
 2019-05-27 11:22:33 -04:00
Neerti
3e1555c4f8 Merge pull request #6167 from Heroman3003/laptop-bugfixes 
Fixes some bugs with laptop
 2019-05-19 17:24:10 -04:00
Novacat
9b291fa5b2 Merge pull request #5226 from VOREStation/upstream-merge-6160 
[MIRROR] Fixes access restrictions for com&com MC program
 2019-05-14 00:01:14 -04:00
Novacat
f39068dd19 Merge pull request #5225 from VOREStation/upstream-merge-6152 
[MIRROR] Restricts alarm monitor MC program access to engineering
 2019-05-14 00:01:06 -04:00
Novacat
09dedeb6c9 Update alarm_monitor.dm 2019-05-13 22:57:31 -04:00
Neerti
fb5a2f1904 Merge pull request #6160 from Heroman3003/commod-fix 
Fixes access restrictions for com&com MC program
 2019-05-13 22:57:12 -04:00
Novacat
ad5fa6c7e3 Update camera.dm 2019-05-13 22:57:06 -04:00
Novacat
d95b7fda42 Update camera.dm 2019-05-13 22:56:41 -04:00
Neerti
74aa8184bf Restricts alarm monitor MC program access to engineering 2019-05-13 22:55:57 -04:00
Neerti
31174cee2d Restricts camera access on MC 2019-05-13 22:55:47 -04:00
Anewbe
d1c953fb0e Merge pull request #6161 from Heroman3003/atmosaccessfix 
Fixes access restriction for MC atmos control
 2019-05-12 13:57:34 -04:00
Novacat
0b8648a0b1 delet conflicts 2019-05-09 13:42:09 -04:00
Atermonera
445923d699 Fixes bug with custom laptops/tablets 2019-05-09 13:05:54 -04:00
Novacat
f71bfd4bf2 Merge pull request #5190 from Heroman3003/mc-opening-table 
Makes laptops require table to be opened
 2019-05-05 20:32:04 -04:00
Novacat
a8bfa80298 Merge pull request #5189 from Heroman3003/mc-camera-access 
Restricts access on camera program
 2019-05-05 20:31:34 -04:00
Heroman3003
e7d492852c Makes laptops require table to be opened 2019-05-06 09:59:49 +10:00
Heroman3003
c1263a31e8 Restricts access on camera program 2019-05-06 09:55:58 +10:00
Heroman3003
6c3b174b4a Restricts alarm program to engineering 2019-05-06 09:51:30 +10:00
Unknown
1b7bab5810 Conflict Resolution Four 2019-04-28 22:37:49 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00