cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-06-05 21:44:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 9 Branches 26 Tags
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
Commit Graph

12971 Commits

Author SHA1 Message Date
Mark9013100 17b6d4e3c7 Sec soft cap sprite improvements & ERT rig pathfile 2015-08-08 08:40:56 -04:00
Mark9013100 b601310f9b Men in black 2015-08-08 06:01:35 -04:00
PsiOmegaDelta c560bd8d79 Merge pull request #10404 from mwerezak/stack-fix 
Material stack related fixes
 2015-08-08 09:56:25 +02:00
Neerti 1c8a395bcf Adds jumpskirts for engineering, medical, and cargo. 2015-08-07 23:39:40 -04:00
Neerti 9e6eef57f7 Makes windows require only one sheet per window if it's not a 'full' window. 2015-08-07 21:34:04 -04:00
Neerti a8c4245245 Merge pull request #129 from Neerti/8/7/2015_bay_merge 
Syncs to Bay (8/7/2015)
 2015-08-07 20:33:48 -04:00
Neerti d911badae8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge 
Conflicts:
	.travis.yml
	polaris.dme
 2015-08-07 20:25:57 -04:00
HarpyEagle fc7e89380e More material renames 
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
 2015-08-07 17:10:35 -04:00
Mark9013100 a86443b7ae ecks dee 2015-08-07 11:04:04 -04:00
Kelenius 210d8fac22 Updates mechfab to not be terrible, WIP 2015-08-07 18:01:12 +03:00
PsiOmegaDelta a6d9002806 Merge pull request #10442 from Baystation12/dev-freeze 
Dev freeze
 2015-08-07 10:37:47 +02:00
PsiOmegaDelta 8ca5d01dcf Crematorium Destroy() 
Adds a missing Destroy() for the crematorium tray.
Changes X.loc = loc into X.forceMove(loc).
 2015-08-06 08:39:24 +02:00
PsiOmegaDelta 863832b347 Post-merge fixes. 
Renames define.
Re-corrects access checks.
 2015-08-06 08:18:39 +02:00
PsiOmegaDelta 03578d4ea3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-06 08:12:38 +02:00
PsiOmegaDelta 87fcd408bd Merge pull request #10436 from mwerezak/cult-construct-nightvision 
Adds nightvision to cult constructs
 2015-08-06 06:38:49 +02:00
mwerezak 0bc9468022 Merge pull request #10431 from PsiOmegaDelta/150805-HoloRuntime 
Fixes holodeck runtime.
 2015-08-05 23:06:04 -04:00
mwerezak e5950d32d8 Merge pull request #10264 from RavingManiac/dev-freeze 
Refactors floating and magboot checks. Fixes #10256
 2015-08-05 23:05:34 -04:00
Kelenius 92ca942fa9 Fixes #10219 - cables don't always qdel 
Dem snowflake code
 2015-08-05 18:13:38 +03:00
PsiOmegaDelta cf1ffd273a Fixes holodeck runtime. 
initial() doesn't work well with lists. Causes a null value.
 2015-08-05 09:33:34 +02:00
PsiOmegaDelta 73a9c24017 Removes code in mob/living/bot/Life() that is now handled by mob/living/Life(). 2015-08-05 09:26:43 +02:00
PsiOmegaDelta 3e266ab377 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-05 09:25:53 +02:00
PsiOmegaDelta 6b01a67c50 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm
 2015-08-05 09:16:50 +02:00
GinjaNinja32 c71d78ab1a add debug verb as pAI-spawning adminverb 2015-08-05 00:50:04 +01:00
GinjaNinja32 595b58197d fix pAI radios not working 2015-08-05 00:49:28 +01:00
Kearel 10359889e7 Fixes 
Slight change to airflow/animations interaction when buckled
 2015-08-04 13:41:27 -05:00
GinjaNinja32 117ffca6d0 Merge pull request #10423 from Kelenius/ofBotsAndZAS 
Of bots and ZAS
 2015-08-04 13:26:30 +01:00
GinjaNinja32 9a4b53c765 Merge pull request #10360 from atlantiscze/beep-beep-beepsky 
Fixes #10355
 2015-08-04 12:36:35 +01:00
PsiOmegaDelta 93011f94c4 Merge pull request #10425 from Baystation12/dev-freeze 
Dev
 2015-08-04 13:07:11 +02:00
Kelenius e935baf1d8 Fixes #10418 - bots don't remover from stuns 2015-08-04 12:41:32 +03:00
mwerezak d1bd146b1a Changes reinforced glass material name 
Gives the reinforced glass material a name that is easier to verify for
correctness.
 2015-08-03 23:01:34 -04:00
Neerti 95240c989b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync 
Conflicts:
	polaris.dme
 2015-08-03 22:13:18 -04:00
Kearel f50e140941 Bike 2015-08-03 20:54:12 -05:00
GinjaNinja32 70c302ad03 Merge pull request #10415 from PsiOmegaDelta/150803-LightingRuntime 
Fixes #10409.
 2015-08-04 00:47:11 +01:00
GinjaNinja32 a099fc4401 Merge pull request #10413 from PsiOmegaDelta/150803-Cleanup 
Removes debug proc.
 2015-08-04 00:46:40 +01:00
mwerezak 76ceaa904b Fixes admin or event spawned antags not spawning 
Pending players were selected but the antag roles were never finalized.
 2015-08-03 12:06:23 -04:00
RavingManiac aeea42ded9 Refactors floating and magboot checks. Fixes #10256 2015-08-03 23:19:04 +10:00
PsiOmegaDelta c25212463a Fixes #10409. 
Ports https://github.com/ParadiseSS13/Paradise/pull/1622.
 2015-08-03 10:15:24 +02:00
PsiOmegaDelta 34ad83baae Removes debug proc. 
It isn't needed.
 2015-08-03 09:31:40 +02:00
Atlantis ad45e5d16b Implements req_one_access for bots, as per request on GitHub discussion. 2015-08-02 23:23:18 +02:00
GinjaNinja32 d050606665 Changes tables to rotate correctly with client.dir 2015-08-02 15:03:42 +01:00
mwerezak 8f4394266b Fixes not being able to insert a complete stack into the protolathe 
The call order meant that if you tried to insert a complete stack, use()
would qdel the stack causing do_after() to fail.
 2015-08-02 00:26:30 -04:00
mwerezak 0ceb0e291d Fixes #10314 
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
 2015-08-02 00:01:10 -04:00
mwerezak e3609bac94 Adds common proc to obtain the material of an object 
Adds a common get_material() proc to objects, and implements overrides
where applicable
 2015-08-01 23:03:21 -04:00
PsiOmega f8d86900a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm
 2015-08-01 19:45:42 +02:00
PsiOmegaDelta f8799035f4 Merge pull request #10400 from Baystation12/master 
Master -> Dev-Freeze
 2015-08-01 19:44:22 +02:00
mwerezak f2bfc5a720 Merge pull request #10397 from Zuhayr/dev-freeze 
Fixes
 2015-08-01 13:02:23 -04:00
GinjaNinja32 495f80fff6 Change callproc to check validity earlier 
Callproc now checks validity of a call *before* prompting for arguments, instead of after, and can now check the validity of global (/proc/foo) procs.
 2015-08-01 17:19:36 +01:00
Zuhayr 71433e024d Merge pull request #10388 from mwerezak/light-suit 
Cybersuit and sprite fixes
 2015-08-02 01:13:46 +09:30
Zuhayr 840b5b756b Fixes #10358, #10359 and #10257 2015-08-01 23:17:27 +09:30
Zuhayr 2a51b778d6 Fixes #9611 2015-08-01 21:10:48 +09:30