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
42,708 Commits 6 Branches 0 Tags
e08cbef04450ffa45500b499850584bbe0dbff6d
Commit Graph

42708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Aronai Sieyes
dc3a587b7f Merge pull request #3390 from Verkister/collors 
Small Shock/Holo collar tweaks.
 2018-04-06 15:11:16 -04:00
Leshana
c8dd30846c Merge pull request #3378 from VOREStation/polaris-sync-2018-03-30 
Polaris Sync 2018-03-30
 2018-04-06 14:42:19 -04:00
Verkister
5d8b6cd1a6 Small Shock/Holo collar tweaks. 
-Updates their old >> dialogue.
-Makes shock collars taggable.

Was gonna fix them showing up in forced lowercase on people but that turned out to be a separate polaris issue that I just opened a fix for up there.
 2018-04-05 15:48:03 +03: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
Atermonera
a6ebe9b44a Merge pull request #5145 from VOREStation/vs-port-3058 
[PORT] Halve character-join lag
 2018-04-04 17:38:31 -07:00
Atermonera
b63acc083d Merge pull request #5143 from VOREStation/fix-usr 
Reverted use of 'usr' back to 'user' from commit 05fd53e
 2018-04-04 17:35:33 -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
Aronai Sieyes
c9882ff37c Merge pull request #3375 from Mewchild/MC-3374 
Fixes untagged sorting junction
 2018-04-03 15:12:47 -04:00
Aronai Sieyes
5a284b2f3c Merge pull request #3363 from Mewchild/MC-Cameras 
Fixes incorrect camera naming/networks.
 2018-04-03 15:09:49 -04:00
Aronai Sieyes
149ae14d36 Merge pull request #3379 from VOREStation/Cameron653-patch-4 
Fixes a bug. It's flatland zorren.
 2018-04-03 15:09:05 -04:00
Atermonera
cdf794950e Merge pull request #5135 from Woodratt/03302018_bugfixesandadjustments 
Map fixes and tweaks
 2018-04-02 23:52:20 -07:00
Atermonera
da338cc94d Merge pull request #5134 from Lorwp/pilotfallback 
Actually adds adhoc_fallback to pilot headsets
 2018-04-02 23:51:41 -07:00
Atermonera
a059ed0de3 Merge pull request #5133 from Cameron653/patch-1 
Syndicate Dufflebag Tweak
 2018-04-02 23:51:21 -07:00
Leshana
9634cf04ce Don't kick admin observers for inactivity. They might be waiting for ahelps. 2018-04-02 22:48:00 -04: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
Arokha Sieyes
0e2f41ea86 More optimizations for character joins 2018-04-02 16:49:44 -04:00
Arokha Sieyes
a6cfbc4f42 Initial cleanup/changes 2018-04-02 16:36:04 -04:00
Mewchild
0ca1ae9e08 In which MC is dumb. Actually removes network override 2018-04-02 11:40:36 -05:00
MarinaGryphon
6cb7d9a10c Fixes wallet-HUD interaction issues. (#5130) 
* Fixes wallet-HUD interaction issues.

* Fixes HUDs, too. Forgot to commit this the first time. Also hopefully didn't change the map to examplemap.

* Fixes an indentation error.
 2018-04-01 22:46:13 -05:00
Anewbe
86285d305a Merge pull request #5131 from Neerti/3/30/2018_poi_grouping 
Adds Map Template Groups
 2018-04-01 22:45:18 -05:00
Cameron653
f66f87b1f6 Fixes a bug. It's flatland zorren. 
Fixes #3376
 2018-04-01 23:07:12 -04:00
Leshana
1f4bdc4389 Reverted use of 'usr' back to 'user' from commit 05fd53ebcc 2018-04-01 22:03:10 -04:00
Anewbe
4220aae17a Merge pull request #5137 from Atermonera/changelog4 
Updates changelog
 2018-04-01 19:29:35 -05:00
Mewchild
2634ff3119 Camera types exist to determine networks! 2018-04-01 18:34:27 -05:00
Leshana
b9635ac9fa Merge pull request #3352 from Mewchild/MC-CEAuth 
Adds Keypad Auth to CE Office
 2018-04-01 19:28:05 -04:00
Leshana
666215bae8 Merge pull request #3369 from VOREStation/aro-posiempty 
Fixes infinite loop in FBP naming w/o client
 2018-04-01 19:17:38 -04:00
Leshana
6e73968720 Merge pull request #3360 from VOREStation/aro-bellies 
Probably maybe fixes blank lines for prey
 2018-04-01 19:15:27 -04:00
atermonera
d1db08ffeb Updates changelog 2018-04-01 15:13:50 -07:00
Mechoid
185201c112 Merge pull request #5125 from Anewbe/bandaids 
Normal brute kits disinfect wounds
 2018-04-01 15:06:19 -07:00
Mechoid
739bbd6e2b Merge pull request #5073 from mistyLuminescence/wallets 
Wallet Expansion!
 2018-04-01 15:01:05 -07:00
Leshana
88c4ca0246 Fix light/camera layers for macros and fix constants for them too. 2018-04-01 16:29:52 -04:00
Leshana
07c0ef2b8a Fix unused variable warnings. 2018-04-01 16:17:35 -04:00
Woodratt
266b25232d Map fixes and tweaks 
- Flashers in brig cells now should work, extra floor flash in communal brig to deal with crims.
- Inproper access, SMES rooms.
- Trader start point being dark now fixed.
- Medical Vendor Plus has more advanced burn and trauma kits. Also splints.
- Cell 1 and 2 in the brig can now be accessed by detectives.
- Additional r-walls next to the engine room to help with rads.
- Floor decals in a couple areas.
- RD office now has its telescreen back.
 2018-03-31 22:33:11 -07:00
Lorwp
12bf2d1bf7 Actually adds adhoc_fallback to pilot headsets 2018-04-01 15:04:25 +10:00
Neerti
183a567db0 Merge pull request #5059 from Heroman3003/slime-behavior-fixes 
Fixes and tweaks for slime behavior.
 2018-03-31 23:35:24 -04:00
Mewchild
6bc1e0c316 Fixes untagged sorting junction 2018-03-31 18:54:15 -05:00
Atermonera
d49ac27d7f Merge pull request #5102 from Verkister/orgons 
Fixes inconsistencies in organ system
 2018-03-31 12:15:51 -07:00
Atermonera
8b7fe2129a Merge pull request #5100 from Verkister/patch-10 
Re-establishes existing foundations for human icon construction
 2018-03-31 12:14:23 -07:00
Cameron653
4a1ef0dbd6 Makes syndie dufflebags hint that they let you move faster 2018-03-31 11:02:01 -04:00
Leshana
6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30 
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.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/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-03-31 09:20:59 -04:00
MarinaGryphon
545cc15849 Adds a message on emag to the battle arcade machine. (#5129) 
* Updates one arcade machine emag message to to_chat, adds another.

* Returns 1 in emag_act for orion trail.

* Converts a bunch of stuff to macros. Should probably not break anything.

* Fixes an improper macro usage.

* Attempts to fix all 20 errors.
 2018-03-30 19:36:45 -05:00
Anewbe
da78c67eb1 Merge pull request #5101 from Verkister/patch-11 
Fixes custom accessories not showing up on things
 2018-03-30 19:34:18 -05:00
Anewbe
6caa8e08cf Merge pull request #5113 from Woodratt/03262018_44revolver 
44 revolvers
 2018-03-30 17:46:37 -05:00
Neerti
f26dd30aa5 Merge pull request #5114 from VOREStation/vplk-debug-admin 
Grant remote profile access to R_DEBUG holders
 2018-03-30 18:45:26 -04:00
Neerti
f429a176e4 Adds Map Template Groups 
Adds ability to have many different 'versions' of a PoI, yet only having one show up per round.
An example on how to do this is provided with Radio Free Sif (aka DJOutpost).
Just make sure all the different versions have the same 'template_group' value.
 2018-03-30 05:34:11 -04:00
Arokha Sieyes
794185d3f2 Fixes infinite loop in FBP naming w/o client 2018-03-29 23:46:19 -04:00
Neerti
9ff18723f4 Merge pull request #5128 from Atermonera/pai_mani 
Fixes #4951
 2018-03-29 23:21:15 -04:00
Neerti
f5c331b142 Merge pull request #5127 from VOREStation/vplk-table-layer-fixes 
Table Layering and Runtime Fixes
 2018-03-29 23:20:57 -04:00
Neerti
26344459f8 Merge pull request #5126 from VOREStation/vplk-darkness-fix 
Fixes fullbright mode hiding lighting overlays.
 2018-03-29 23:20:47 -04:00