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
40,781 Commits 7 Branches 0 Tags
73235788b72ea032bccd895e0c46888f404582b2
Commit Graph

19393 Commits

Author SHA1 Message Date
Arokha Sieyes
73235788b7 more junk 2018-01-18 19:31:37 -05:00
Arokha Sieyes
2a5ee0c541 basic junk 2018-01-18 19:29:37 -05:00
Spades
8e42db3e7f More guns for the gun box 
- NT Mk98 (re)added.
- P92X added.
 2018-01-18 18:53:43 -05:00
Leshana
bd742ca71f Merge pull request #2789 from VOREStation/aro-thirdruntime 
Fixes a runtime and potential future runtime
 2018-01-18 18:48:41 -05:00
Arokha Sieyes
01e8b8459c Merge pull request #2793 from VOREStation/aro-spacebarheating 
Remove reaction reagent powergaming
 2018-01-18 18:44:18 -05:00
Arokha Sieyes
59a1d1680a Merge pull request #2790 from VOREStation/aro-qdels 
Destroy() Fixes
 2018-01-18 18:44:00 -05:00
Arokha Sieyes
ade70895c0 POLARIS: What if I want to wear a mouse on my head 2018-01-18 18:29:42 -05:00
Arokha Sieyes
da3358a729 Merge pull request #2791 from VOREStation/aro-knifepath 
Knife path fix for VS trashpiles and a fluff item
 2018-01-18 18:20:47 -05:00
Arokha Sieyes
853c9699dd VS: Clean up NIFs in human destroy in particular 2018-01-18 18:19:17 -05:00
Arokha Sieyes
4432b2dd8b VS: Adds Destroy on shock collars (tsk tsk) 2018-01-18 18:19:16 -05:00
Arokha Sieyes
d6c42739f6 POLARIS: Remove the ability to powergame with tiny amounts of certain reactions 2018-01-18 18:12:57 -05:00
Arokha Sieyes
dc0e602663 Knife path fix for VS trashpiles and a fluff item 2018-01-18 15:48:14 -05:00
Arokha Sieyes
00b69ca913 Clean up persist messages in server log 
Some of them look like errors or incomplete when they aren't
 2018-01-18 15:35:31 -05:00
Arokha Sieyes
02c0430e99 POLARIS: Simplify Destroy on plane_master 
If we're being Destroyed, the mob probably is too. Their job to remove references to us though.
 2018-01-18 14:27:23 -05:00
Arokha Sieyes
f754f3b715 POLARIS: Just return the normal hint in Destroy on plane holders 2018-01-18 13:56:31 -05:00
Arokha Sieyes
0b9150652a POLARIS: Lazily clear these lists 2018-01-18 13:51:31 -05:00
Arokha Sieyes
7cbe96e959 POLARIS: Lighting runtime for accessing a list that might not exist 2018-01-18 13:50:36 -05:00
Arokha Sieyes
74c24f84f5 Typo causes colorblindness to do weird things 
Like show you vantag HUD icons
 2018-01-18 10:21:17 -05:00
Arokha Sieyes
b8d8248052 Merge pull request #2782 from VOREStation/aro-spoophud 
Don't show ghost huds on people who've died okay
 2018-01-17 23:19:57 -05:00
Arokha Sieyes
cf05d8c4c2 POLARIS: Don't show ghost huds on people who've died okay 2018-01-17 23:01:33 -05:00
Arokha Sieyes
a603c22066 Merge pull request #2780 from VOREStation/aro-runtime 
Fix a runtime in deleting human
 2018-01-17 22:36:24 -05:00
Arokha Sieyes
b58866d41f Fix a runtime in deleting human 
What it says. Don't do these if we're deleting ourselves and dropping all our stuff.
 2018-01-17 21:35:43 -05:00
Arokha Sieyes
9a90162d04 Fix colorblindness trait plane_holder instantiation and balance 2018-01-17 21:17:51 -05:00
Arokha Sieyes
1012075e5d POLARIS: Sanity check in plane_holder 
This was related to a bug we encountered. The bug doesn't affect you, but it makes sense to give this sanity check here too.
 2018-01-17 21:15:44 -05:00
Arokha Sieyes
30790f2bd5 Merge pull request #2776 from VOREStation/vplk-cspbabcd 
Fixes character setup preview backround changing.
 2018-01-17 18:36:45 -05:00
Arokha Sieyes
508ea0d6a3 Merge pull request #2775 from VOREStation/syncomatic 
Polaris Sync
 2018-01-17 18:36:35 -05:00
Leshana
a25f531e70 Fixes character setup preview backround changing. 2018-01-17 18:15:24 -05:00
Arokha Sieyes
c0e4109cb2 Merge pull request #2767 from VOREStation/arovplk-tether-dedep 
Fix dependencies on tether map in main codebase
 2018-01-17 18:07:43 -05:00
Arokha Sieyes
6b2f4c6146 Fix update_icons() on human update_transform() and effects.dmi unnamed state 2018-01-17 17:58:11 -05:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018 
Planes, layers, human/update_icon()
 2018-01-17 17:56:51 -05:00
Leshana
fe431c8e46 Trims back wilderness code that was dependent on tether map. 
* Reverted random.dm back to Polaris as there is no need for the VOREStation customs.
* Fixed /obj/random/outside_mob so it will actually work (You can't set vars on a type!)
* Removed all wilderness code outside of the tether map.  It was only setting life_disabled on mobs spawning there. We can do that with a subsystem or by dynamic maploading instead.
 2018-01-17 15:23:22 -05:00
Anewbe
6fb1b66ced Merge pull request #4564 from Neerti/1/17/2018_blob_fix 
Fixes Blob Tasering
 2018-01-17 14:17:40 -06:00
Abbie Fland
c2d294ac74 Prevent stalls in dogborg self-clean cycle 
When something unexpected (such as mice, which are neither humans nor
items) is in a scrubpup's garbage compactor, it could stall forever when
performing a self-clean. This changes it to treat anything it doesn't
know how to digest as an indigestible item, treating it like other
indigestible items such as ID cards.

This also changes the self-clean damage ticks to harm anything living,
rather than just human.
 2018-01-17 20:01:14 +00:00
Anewbe
f5bf9fdd00 Merge pull request #4562 from VOREStation/pol-zshadowdel 
zShadow qdel fix
 2018-01-17 13:47:27 -06:00
Neerti
5b54f4c875 Surface Map Work (#4557) 
* Tweaks Surface, POI system

* More Stuff

* Travis Appeasement

* Fixes invisible banner.
 2018-01-17 13:46:19 -06:00
Arokha Sieyes
f2fef6f410 Planes Framework (#4545) 
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
 2018-01-17 13:45:54 -06:00
Neerti
d2f3ca0a74 Fixes Blob Tasering 
Blobs are no longer harmed by tasers or other strange weapons that don't damage structures.
 2018-01-17 14:19:40 -05:00
Leshana
62ef3b1820 Make the Metor Strike random event be configurable per map. 
* Added a variable to configure which areas are vulnerable to meteor strikes instead of hard coding it.
 2018-01-17 11:04:20 -05:00
Arokha Sieyes
e3d965c423 POLARIS: zshadow del fix 2018-01-17 02:18:50 -05:00
Arokha Sieyes
f3f4b945bb Merge pull request #2772 from VOREStation/aro-shadowdel 
Zshadow del fix
 2018-01-17 00:41:45 -05:00
Leshana
9456969a8e Make the persistence of spawn-points at end of be configurable per map. 
* Added three vars to the map datum to confgure which spawn point should be persisted for players who are dead, evac'd or stayed on station.
 2018-01-17 00:31:04 -05:00
Arokha Sieyes
0df3060a3e Merge pull request #2762 from Verkister/squashbelly 
Fixes science borg analyzer belly and couple other things. (*squish edition)
 2018-01-16 23:47:17 -05:00
Arokha Sieyes
ad5ab9d4a8 Merge pull request #2771 from VOREStation/aro-rigboot 
RIG Boot sequence
 2018-01-16 23:44:38 -05:00
Arokha Sieyes
79406b254d Merge pull request #2770 from VOREStation/vplk-ghostfix 
POLARIS: Fix regular mobs seeing when ghosts point at things.
 2018-01-16 23:44:19 -05:00
Arokha Sieyes
5b4e48ca3a Merge pull request #2769 from AbbieFland/engi-vision 
Changes AR-E glasses to show engineering alarms
 2018-01-16 23:44:09 -05:00
Arokha Sieyes
bcd71c44c4 POLARIS: zshadow del fix 2018-01-16 23:42:16 -05:00
Arokha Sieyes
e72bf9ef43 POLARIS: RIG Boot sequence 
For fun! No mechanics changed, just looks neat.
 2018-01-16 23:15:26 -05:00
Atermonera
775559357f Fixes runtime in seed_packets.dm (#4549) 
* Fixes runtime in seed_packets.dm

* Moves sleeps to initialize()

* No more sleep
 2018-01-16 21:07:38 -06:00
Leshana
afd37c32db POLARIS: Fix regular mobs seeing when ghosts point at things. 
* Fixed it by adding a facility by which code can check if a mob can logically see things present on another plane.
 2018-01-16 20:04:57 -05:00
Abbie Fland
59fe79961d Changes AR-E glasses to show engineering alarms 
They were linked to the base alarm_monitor, which meant they got a blank
alarm panel.

This changes them to use alarm_monitor/engineering which has the
atmos/fire/power alarms common to engineering.
 2018-01-16 18:54:04 -05:00