cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,679 Commits 7 Branches 0 Tags
2d40d755dae11a0a4e34f0006871f5415706a135
Commit Graph

38127 Commits

Author SHA1 Message Date
Razgriz
02d697c444 Axis rename 2020-04-09 13:58:07 -07:00
Razgriz
f061fa27af Axis rename 2020-04-09 13:57:31 -07:00
Razgriz
f6279a9f1a Axis rename 2020-04-09 13:56:46 -07:00
Razgriz
fcec2196fd Axis rename 2020-04-09 13:56:27 -07:00
Razgriz
934d2e95e4 Delete nazirus_yw.dm 2020-04-09 13:56:02 -07:00
Razgriz
3baaa4ecf4 Axis rename 2020-04-09 13:55:33 -07:00
Killian
104f11df35 Merge branch 'master' into master 2020-04-06 05:15:21 +01:00
Killian
0d79da1a04 manual sprite ports and mechanical cycling removal 2020-04-06 04:27:44 +01:00
Repede
d2b0878508 Moved all commented out events into the disabled events list, may be required for ship events. 2020-04-05 19:33:19 -04:00
Repede
809b823535 Merge branch 'master' into maptweaks 2020-04-05 16:14:33 -04:00
Repede
b2386e22f3 Fixes #658 and #644 2020-04-05 16:10:11 -04:00
Repede
4618664eca Merge branch 'master' into kk-convkit 2020-04-05 14:05:47 -04:00
Repede
388a7277e7 removes jr explorer for now 2020-04-05 13:51:49 -04:00
Repede
2e7db593d9 RPD fix 2020-04-05 12:30:11 -04:00
Aronai Sieyes
8b10676119 CHECK_TICK in xenoarch setup for the sake of largermaps 2020-04-05 12:10:03 -04:00
Aronai Sieyes
650464d104 Fix runtime in vore_remains if they are mapped in 
Also make it more robust to preds not having ckeys or names
 2020-04-05 12:09:38 -04:00
Repede
f2740bf031 Fixing runtimes 2020-04-05 12:06:49 -04:00
Repede
c6b49dace2 zas test fix 2020-04-05 03:02:23 -04:00
Repede
78dd1b0ea8 final fixes and tweaks with upstream update and shuttles 2020-04-05 02:25:10 -04:00
Repede
8b3ffefd66 Prison vendor icon fix and Arrivals shuttle fix 2020-04-04 22:50:11 -04:00
Aronai Sieyes
965b8c2f94 Various Fox Fixes 2020-04-04 20:20:47 -04:00
Repede
6297f63f99 Fixing errors 2020-04-04 15:03:14 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
RadiantFlash7
909393115d Merge pull request #8 from Yawn-Wider/master 
Updating my Branch
 2020-04-03 22:34:31 -04:00
RadiantFlash7
687d74f651 Merge branch 'master' of https://github.com/RadiantFlash7/YWPolarisVore 2020-04-03 22:14:43 -04:00
RadiantFlash7
8692c589f1 Security update++ Geigers and more 
Rebuilds security to /not/ suck.
Left Vacant office for security Next to HoS office, for the Security Pilot Officer (To be added in future)
Dock for Interceptor left near sec.
New Geigers added around the map!
Vents and scrubber fixes.
adds in HoP req console which was not in by default.
 2020-04-03 22:14:39 -04:00
Aronai Sieyes
94d6ccd763 Merge pull request #7117 from VOREStation/aro-lookingglass 
Add Looking glass holodeck
 2020-04-03 15:14:00 -04:00
Aronai Sieyes
97986327bd Merge pull request #7119 from VOREStation/upstream-merge-6904 
[MIRROR] Clean up various things
 2020-04-03 13:15:16 -04:00
Aronai Sieyes
b82c48ee2c Merge pull request #7112 from Novacat/nova-shuttle 
Adds Mechanicus Techpriest Robes
 2020-04-03 13:11:33 -04:00
Novacat
ae4c21b931 Merge pull request #7120 from VOREStation/upstream-merge-6927 
[MIRROR] Adjust turret target finding process
 2020-04-03 12:58:24 -04:00
Aronai Sieyes
67dd92e196 Merge pull request #7111 from Heroman3003/slottening 
Gives slots to most fluff items
 2020-04-03 12:35:12 -04:00
Aronai Sieyes
763608fc36 Update portable_turret.dm 2020-04-03 12:25:47 -04:00
Aronai Sieyes
496a34ab2b Update grown.dm 2020-04-03 12:24:58 -04:00
Aronai Sieyes
58dc70861c Update unsorted.dm 2020-04-03 12:23:21 -04:00
Atermonera
2789cbe639 Adjust turret target finding process 2020-04-03 03:16:23 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
Aronai Sieyes
307bea35d9 Fix console html tag 2020-04-03 00:17:39 -04:00
Aronai Sieyes
e39494a87f VS: Vorey holodeck things 2020-04-02 23:43:13 -04:00
Aronai Sieyes
74134e4ac9 Looking Glass Holodecks 2020-04-02 23:42:47 -04:00
Aronai Sieyes
df58a60554 Fix mines qdel 2020-04-02 20:28:40 -04:00
Aronai Sieyes
6ac1c2b2fa VS: Remove unused vorestation edits 2020-04-02 20:23:56 -04:00
Heroman
1ae1900cd3 Fixes a random v 2020-04-03 10:13:23 +10:00
Heroman
7e3019971d Fixes identetions 2020-04-03 10:08:49 +10:00
Unknown
6d7cb1cf7a Adds Mechanicus Techpriest Robes 
https://www.youtube.com/watch?v=ztzq05IzYds

Adminbus Only.
 2020-04-02 19:44:21 -04:00
Heroman
525bbb5650 Gives slots to most fluff items 2020-04-03 09:01:39 +10:00
Unknown
dbf10c7dbf Finishes this PR 2020-04-02 18:28:21 -04:00
Unknown
37c563d56c I should be more consistent in naming things 2020-04-02 15:04:53 -04:00
Unknown
575ac1018a Voidsuit Additions 
- Adds a Captain's voidsuit for the Captain, replaces the old Colony Director armor.
- Adds a Prototype Voidsuit. Currently has mercenary voidsuit stats and does not spawn in anywhere.
- Adds new cyclers for the new voidsuits.
 2020-04-02 14:59:19 -04:00
Aronai Sieyes
edb63dc978 Merge pull request #7104 from VOREStation/aro-blahtercooler 
Remove watercooler shields until Joan does icons
 2020-04-02 11:37:42 -04:00
Aronai Sieyes
a2bf4c602a Remove watercooler shields until Joan does icons 2020-04-02 11:23:52 -04:00