cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 19:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,289 Commits 7 Branches 0 Tags
c25bd646df1b6f52ea3ecab5f7718cb0403cea01
Commit Graph

1453 Commits

Author SHA1 Message Date
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Atermonera
22f91f07a5 Merge pull request #5460 from Woodratt/07312018_apcspritechange 
APC Sprite Change
 2018-08-02 15:25:41 -04:00
Atermonera
24549cd3c4 Merge pull request #5460 from Woodratt/07312018_apcspritechange 
APC Sprite Change
 2018-08-02 12:24:40 -07:00
Woodratt
67bc6ac4ed APC Sprite Change 
- Port from Virgo recolored slightly to match closer to the old sprite
- Addition of directional sprites for the APCs
 2018-07-31 17:56:04 -07:00
Neerti
6bdf355e6d Finishes thunderstorms. 2018-07-31 14:45:26 -04:00
Anewbe
5c2d57e43b Admin Supermatter Setup now closes the monitoring room shutters (#5442) 
* Admin Supermatter Setup now closes the monitoring room shutters

* Fixes a copy-paste error
 2018-07-28 01:09:01 -04:00
Anewbe
1b173f98ac Admin Supermatter Setup now closes the monitoring room shutters (#5442) 
* Admin Supermatter Setup now closes the monitoring room shutters

* Fixes a copy-paste error
 2018-07-27 22:08:29 -07:00
Hawk_v3
796b90c006 Merge remote-tracking branch 'upstream/master' 2018-07-21 19:05:19 +01:00
Repede
1b5cb2bafa Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 2018-07-17 20:30:33 -04:00
gozulio
d21cea3965 R-UST Fixes. (#5410) 
R-UST Consoles can now be Deconstructed.
R-UST Consoles will not be inaccessible if broken or unpowered.
R-UST Consoles now accurately feed back if they're unpowered or broken.
R-UST Fusion field can no longer be stared at to hard by the AI.
 2018-07-14 15:15:52 -04:00
gozulio
07dfd5211b R-UST Fixes. (#5410) 
R-UST Consoles can now be Deconstructed.
R-UST Consoles will not be inaccessible if broken or unpowered.
R-UST Consoles now accurately feed back if they're unpowered or broken.
R-UST Fusion field can no longer be stared at to hard by the AI.
 2018-07-14 14:15:39 -05:00
Neerti
5a221f37a4 Merge pull request #5398 from Mechoid/CablePrints 
Cutting cables will now transfer fingerprints.
 2018-07-09 11:39:31 -04:00
Mechoid
1dbfe94711 Cable fingerprints. 2018-07-08 14:36:13 -07:00
Michael Gosselin
0fecc3d6e5 R-UST AI observer fix 
R-UST Core Sempai no longer notices the AI.
 2018-07-02 20:25:23 -04:00
Repede
d4bb48b2f6 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-29 09:58:53 -04:00
Michael Gosselin
a4fa22f06c Merge remote-tracking branch 'refs/remotes/Repede/master' 2018-06-27 22:53:56 -04:00
Michael Gosselin
d8cfad6d94 Fixing R-UST Consoles 
Consoles will now update state depending on whether they're broken or
unpowered.
Adds checks to make sure you can open unpowered or broken consoles.
 2018-06-27 22:53:40 -04:00
Michael Gosselin
56800356a0 Fixes R-UST Consoles being deconstructable 
Undoes the previous commit, Console will hae to be deconstructed and
repaired to return functionality.
 2018-06-27 21:01:17 -04:00
Michael Gosselin
a858517c14 Fixes R-UT EMP breaking consoles 2018-06-27 19:19:21 -04:00
Hawk_v3
969332d859 Span corrections 
Only found one. Hopefully this will sate Travis?
 2018-06-26 22:39:19 +01:00
Repede
2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-23 17:53:13 -04:00
Cameron653
ef2c62c63a Alien Cable Coil Fix (#5365) 
* Prevents the infinite cable coil alien tool from making more infinite cable coil tools.

* Prevents you from going over the 30 cap.

* Tochat
 2018-06-21 03:26:14 -04:00
Cameron653
2e987ab900 Alien Cable Coil Fix (#5365) 
* Prevents the infinite cable coil alien tool from making more infinite cable coil tools.

* Prevents you from going over the 30 cap.

* Tochat
 2018-06-21 00:26:02 -07:00
Atermonera
fe94038e7a Recharger refactor 2018-06-16 17:15:59 -04:00
Anewbe
91edca4434 Recharger refactor 2018-06-14 15:37:22 -05:00
RadiantFlash7
9d46e68742 blueshield, more clothes/vests, more weapons, phorochem fixes, 
Map additions, Phorochem interface fix, some phoreagents fixed, Added
gauss weaponry and blueshield x01, added blueshield role with
uniform/closet.
 2018-06-11 21:27:11 -04:00
RadiantFlash7
dce8eb97c9 readds trailblazers, more mapping stuff 
seperated map files, lighting set up, telecoms nearly complete, virology
mostly done,
 2018-06-07 23:39:55 -04:00
Arokha Sieyes
4ff48da96a SYNC: Map changes for lighting 2018-05-30 00:56:12 -04:00
Arokha Sieyes
c0c091ed4a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-29-2018 
# Conflicts:
#	code/modules/power/lighting.dm
#	icons/turf/walls.dmi
 2018-05-29 21:05:27 -04:00
Anewbe
d308cb4563 Merge pull request #5269 from deathride58/fancylighting 
Makes lighting a little fancier, reduces the amount of light sources with a power greater than 1
 2018-05-29 13:33:27 -05:00
Arokha Sieyes
6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018 
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-05-25 13:23:47 -04:00
deathride58
09a4cab10f Bumps up the brightness range just a tad to accommodate for the low density of lights aboard the station 2018-05-17 12:17:52 -04:00
Tad Hardesty
927050ce44 Fix various syntactic problems 2018-05-16 21:43:18 -07:00
deathride58
718ca41ea0 tweaks a bunch of lighting values. reduces the amount of light_power values greater than 1 2018-05-16 01:42:01 -04:00
Arokha Sieyes
bdfa34c911 SSAO object excludes 
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
 2018-05-14 11:54:10 -04:00
Arokha Sieyes
91f0c05a4b SSAO object excludes 
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
 2018-05-14 11:38:22 -04:00
Leshana
862f1eff44 Override Polaris change: keep our light power usage the same as it was 2018-05-10 13:48:54 -04:00
Leshana
33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01 
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml
 2018-05-10 13:48:20 -04:00
Atermonera
44cc2e26c7 Merge pull request #5229 from Neerti/4/29/2018_remove_world_REMOVE_WORLD 
for(var/bad_code in world)
 2018-05-01 13:00:18 -07:00
Mechoid
9dda8cfe92 Power cost decrease on Lights and Shield Diffusers 2018-04-29 20:11:20 -07:00
Neerti
be73b8c36a for(var/bad_code in world) 
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
 2018-04-29 17:55:04 -04:00
Leshana
c7cd04b2bb POLARIS: Fix emitters connected to powernet remotely. 
Ensure when we unanchor an emitter that we disconnect from powernet.
 2018-04-19 20:51:15 -04:00
Leshana
b45e065a96 POLARIS: Fix emitters connected to powernet remotely. 
Ensure when we unanchor an emitter that we disconnect from powernet.
 2018-04-17 20:00:29 -04:00
Neerti
f80fe6a1c9 Optimizes Powercell Update Icons 2018-04-12 18:53:47 -04:00
Neerti
228e37e923 Optimizes Powercell Update Icons 2018-04-10 19:58:09 -04:00
Leshana
e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
 2018-04-06 15:40:06 -04:00
Atermonera
d5c5249327 Merge pull request #5147 from VOREStation/vplk-atmos-layers 
Switch cables and pipes to use define constants instead of literals for layers.
 2018-04-04 17:42:36 -07:00
Leshana
8c3e41a705 Small fixes and ports discovered during merge. (#5138) 
* POLARIS: No string compare for assistants

* POLARIS: Move these planes to more useful places

* POLARIS: Only spam ghosts with chat messages from things with real clients

* Fix small forgotten lines of text accidentally left out of VS syncs.

* Fix typo'd plane in lighting.dm and remove redundant definitions.
 2018-04-04 17:35:15 -07:00
Leshana
7da46a6dcc Switch cables and pipes to use define constants instead of literals for layers. 
Also fix a few things to be on the correct plane.  Basically the under-floor stuff is supposed to be on PLATING_PLANE.
Portable atmospherics go on object layer so they are above stationary machinery, given that they move around.
Fixed wires to be on top of pipes like they used to be, otherwise they'd be obscured too often.
 2018-04-02 21:50:03 -04:00
Leshana
88c4ca0246 Fix light/camera layers for macros and fix constants for them too. 2018-04-01 16:29:52 -04:00