cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-28 10:12:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,592 Commits 8 Branches 0 Tags
e1ec137e2ad8f4f70f160fa8a2decdca954fe934
Commit Graph

726 Commits

Author SHA1 Message Date
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Aronai Sieyes
863142066d Merge pull request #8118 from dwinters99/posters 
New posters
 2020-05-29 11:08:02 -04:00
dwinters99
af10438e2f Update code/game/objects/effects/decals/posters/voreposters_vr.dm 
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
 2020-05-29 10:57:40 -04:00
David Winters
ec470180ba Fixed typo, capitalization 2020-05-29 03:06:43 -04:00
David Winters
d57addfdea New posters 
Following in Pip's wake, I made 11 posters. Not much more to say, really.
 2020-05-29 03:00:00 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
izac112
2f8e296e0e Switches back from solcom to solgov and TCG to USDF 2020-05-24 14:10:51 +02:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Atermonera
69fc5d6a3b Merge pull request #7180 from Mechoid/FixWeeds 
Fix weeds
 2020-05-21 14:37:34 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates 
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
 2020-05-18 20:30:52 -04:00
Aronai Sieyes
e3b5d24c8b Obsolete the PROXMOVE flag and uses 2020-05-18 13:31:54 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Atermonera
f758879431 mechs trigger mines. They're not very effective... (#7113) 2020-05-09 04:27:48 -04: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
0cad24568d Fix annoying stupid runtime thing 2020-05-03 17:48:05 -04:00
Aronai Sieyes
49aa045e47 More fixes for aliens.dm 2020-05-03 12:03:57 -04:00
Aronai Sieyes
23978b4be6 Rewrite a bunch of weeds stuff 2020-05-03 11:18:20 -04:00
Unknown
3f61b3362d Fixes compile error 2020-05-03 10:57:17 -04:00
Aronai Sieyes
7e475693a9 Fix for map-edge weeds checking contents of null turfs 2020-05-03 10:52:05 -04:00
Novacat
74cb8f19a1 Update tracer.dm 2020-05-01 14:22:45 -04:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Leshana
10b0323d6f Use can_atmos_pass to reduce proc-calls in c_airblock() 
- Add additional can_atmos_pass value ATMOS_PASS_PROC which indicates custom behavior requiring calling the CanZASPass proc.
  - The benefit being for the other three values we DON'T need to call CanZASPass at all!  We already know the behavior without the overhead of a proc call.
  - Obviously any atom with can_atmos_pass = ATMOS_PASS_PROC cannot now call ..() in CanZASPass() since the default behavior would be to (recursively) call CanZASPass()
  - This required re-numbering the constants, so I also fixed all code that assumed particular values for the constants.
- Switched all types which overrode CanZASPass with custom logic to be can_atmos_pass = ATMOS_PASS_PROC
- Changed /turf/c_airblock() to skip calling /atom/movable/c_airblock() for the three can_atmos_pass values that don't require calling the proc.
 2020-04-30 14:50:57 -04:00
Leshana
4a2e8bb0c4 Fix return values of CanZASPass 
- CanZASPass is supposed to return boolean.  Nobody noticed this bug because ATMOS_PASS_YES and ATMOS_PASS_NO happen to be defined as 1 and 0.  But thats not a good assumption to make, so lets fix it!
 2020-04-30 14:50:57 -04:00
Novacat
3eaa2ad9fa Lore Overhaul (#7493) 
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
 2020-04-29 19:59:03 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Aronai Sieyes
d3da6ae4a5 Refactor move code 2020-04-26 16:42:50 -04:00
Razgriz
0e6b752058 Merge pull request #307 from Shadow-Quill/ShuttleFix 
[URGENT] Fixes shuttle.
 2020-04-24 19:03:53 -07:00
Shadow Quill
2c8aefb881 Doop 2020-04-24 20:40:07 -05:00
Aronai Sieyes
a62a2e4072 WAH 2020-04-23 18:15:55 -04:00
Razgriz
09293a0b02 Merge branch 'master' into UpstreamMergeApril2020 2020-04-22 03:17:50 -07:00
Aronai Sieyes
a2e6467936 FOAAAAAAAM 2020-04-20 17:16:25 -04:00
Aronai Sieyes
bb59718238 Mark some vorestation edits 2020-04-17 11:24:59 -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
Sheep
309c39d731 Adds the "Baa" Poster 2020-04-16 16:58:51 +01:00
Aronai Sieyes
a65715eb86 Add vorestation posters 2020-04-15 12:02:19 -04:00
Aronai Sieyes
a7590e81a9 Merge pull request #7210 from VOREStation/aro-shuttleiocn 
Changes shuttle landing soon warning
 2020-04-13 09:28:53 -04:00
Atermonera
2374a40908 A Tale of Blobs and Man 2020-04-13 01:35:01 -04:00
Razgriz
060f3686db Update reagent_ch.dm 2020-04-12 21:51:51 -07:00
Shadowfire
96e6e66705 puddle fix 
Fix lack of blood trails
removed a world call I forgot to remove, derp
 2020-04-12 12:23:14 +02:00
Razgriz
fa035f56aa Update reagent_ch.dm 2020-04-12 01:39:31 -07:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Aronai Sieyes
6ec7ad58d0 Changes shuttle landing soon warning 2020-04-11 18:18:27 -04:00
Atermonera
07fb7950a6 Merge pull request #6974 from Shadow-Quill/patch-1 
Unfucks arrival shuttle latejoins when shuttle is docked
 2020-04-11 02:51:26 -04:00
Leshana
9a4b3f7c8b Merge pull request #7159 from VOREStation/aro-fixes 
2 fixes and Teshari maws
 2020-04-08 19:30:35 -04:00
Atermonera
5c03273ce8 Merge pull request #6884 from Neerti/event_system_fix 
Rewrites the Rewritten Event System
 2020-04-06 16:23:39 -04:00
Aronai Sieyes
d5befb78e1 Fix infinite server destroying loop in interval effects 2020-04-06 12:08:55 -04:00