cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-05 14:23:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
57,614 Commits 7 Branches 0 Tags
5fe45fc4d69732eedea4e3cdcdce1b24737fbe2f
Commit Graph

2360 Commits

Author SHA1 Message Date
BlackMajor 717a5fa049 aughe 2020-07-23 13:57:39 +12:00
Razgriz f382a1d365 Add quick authentic nif 2020-07-15 21:04:02 -07:00
Razgriz 752888de6e Add quick authentic nif 2020-07-15 21:03:20 -07:00
Razgriz 02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112 e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Aronai Sieyes 86373ecc96 Merge pull request #8050 from VOREStation/Arokha/furtherghost 
Redo respawning
 2020-05-25 11:37:51 -04:00
Atermonera f96757e6c6 Fixes runtime in item_attack.dm, line 81 (#7236) 
Undefined variable /turf/simulated/floor/plating/var/lastattacker
 2020-05-24 17:32:25 -04:00
Aronai Sieyes 49b9896f73 Redo respawning 2020-05-23 17:32:02 -04:00
izac112 e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Razgriz 6c591400e1 Update adminhelp_vr.dm 2020-05-21 04:16:05 -07:00
Razgriz 3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Atermonera c3e5e6c1f1 Edit Appearance and Change Appearance update icon sex 2020-05-19 21:54:38 -04:00
Aronai Sieyes 09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112 c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Aronai Sieyes e585a6dc47 Semi-automate discord ID registration 2020-05-17 21:14:18 -04:00
izac112 a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
Atermonera 3057230bb2 Fixes #649 (#7114) 2020-05-15 16:33:17 -04:00
izac112 bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Aronai Sieyes d4cfdcfb3a Switch to using GLOB.admins instead of admins 2020-05-12 11:16:54 -04:00
Aronai Sieyes 96da7be01b Put APCs and SMESes into GLOB lists to ease iteration 2020-05-11 22:05:41 -04:00
izac112 2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Aronai Sieyes b9262c72f1 Make buildmode AI control reset home turfs when move orders given 2020-05-08 18:46:54 -04:00
Razgriz 00ea17e06c Update admin_verbs.dm 2020-05-07 01:17:21 -07:00
Razgriz 81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
izac112 e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Aronai Sieyes a0a3971449 VS: Stop adjusting cooldown directly 2020-04-30 15:44:19 -04:00
Aronai Sieyes f5cbd8c35e Stop adjusting cooldown directly 2020-04-30 15:43:58 -04:00
Leshana c789cad22e Change to use to_world and add wrapping spans. 2020-04-25 16:15:03 -04:00
Novacat 2c4a0a5831 Merge pull request #7350 from VOREStation/upstream-merge-6998 
[MIRROR] Adds empty filter classes to send messages to particular vchat filters.
 2020-04-23 23:56:38 -04:00
Novacat a9d049f8c2 Update topic.dm 2020-04-23 23:17:11 -04:00
Novacat 3e83916244 Update admin_verbs.dm 2020-04-23 23:11:04 -04:00
Novacat 3ba0aec162 Update admin_verb_lists.dm 2020-04-23 23:10:32 -04:00
Novacat c1a5a07208 Update callproc.dm 2020-04-23 23:02:32 -04:00
Leshana 323f20cfec Adds "Move" command to atom/movable's VV dropdown that lets you jump it to a coordinate. 2020-04-22 11:43:18 -04:00
Atermonera 7bf77736c2 Adds empty filter classes to send messages to particular vchat filters. 2020-04-20 03:28:57 -04:00
Aronai Sieyes 1d22a745e4 Add Gravity Generator, place on tether, update events 2020-04-19 23:37:10 -04:00
Repede e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
Aronai Sieyes 3f03b72ea2 Adjust icon 2020-04-16 13:50:43 -04:00
Aronai Sieyes 3ea7696c38 Adds autosaving 2020-04-16 12:40:30 -04:00
Aronai Sieyes c3d406a47c Merge pull request #7274 from VOREStation/aro-parallaxfix 
Fix parallax slide and admin jump skybox
 2020-04-15 17:12:43 -04:00
Aronai Sieyes 5199e07ed9 Fix parallax slide and admin jump skybox 2020-04-15 15:23:23 -04:00
Leshana 3be0330db2 Remove the goonstation /datum/controller/processScheduler as it is no longer used. 2020-04-14 16:17:32 -04:00
Aronai Sieyes 0d39c5535e Merge pull request #7200 from VOREStation/aro-offmap-rebase2 
ITV Talon offmap spawn jobs
 2020-04-13 09:28:19 -04:00
Leshana 262faa38e4 Replace global all_areas list with world. 
It ends up having similar performance, so might as well not bother with all_areas.
 2020-04-12 18:04:54 -04:00
Runa Dacino 4c612bda81 Switches "Yes" and "no" for Request spice 
https://github.com/VOREStation/VOREStation/issues/7133

states that it's very easy to accidentally press yes using the current layout.
 2020-04-12 14:31:44 +02:00
Erik eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Leshana 65546d4e28 Merge pull request #7150 from VOREStation/sscleanup/ticker 
Refactor the gameticker controller into SSticker
 2020-04-11 19:28:37 -04:00
Aronai Sieyes e2d2964546 Refactor telecomms to send messages to logically adjacent zlevels 2020-04-11 12:03:10 -04:00
Atermonera 8aea6f9788 Merge pull request #6982 from VOREStation/vplk-fix-vv-lists 
Fix VV on lists
 2020-04-11 02:56:48 -04:00
Leshana 6555799119 Revamp Start Now admin verb to actually wait until init is done before starting. 2020-04-10 11:41:38 -04:00