cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 06:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 8 Branches 26 Tags
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
Commit Graph

21285 Commits

Author SHA1 Message Date
Chinsky
0f76c59944 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into technoir 
Conflicts:
	icons/mob/head.dmi
 2015-09-02 04:50:00 +03:00
Chinsky
a3b3e52959 Merge branch 'dev' of https://github.com/comma/Baystation12 into technoir 2015-09-02 04:38:26 +03:00
GinjaNinja32
a6cdeee95c Add autohiss/purr on a per-client toggle 2015-09-01 23:37:56 +01:00
PsiOmega
6e2514d728 Beepsky should no longer attempt to arrest himself. 
Adds additional threat check.
 2015-09-01 18:25:51 +02:00
Chinsky
03f5254850 Restores suit rolling verb. 2015-09-01 13:50:38 +03:00
PsiOmegaDelta
fb670400a1 Merge pull request #10976 from caelaislinn/computer_fix 
Fix for runtime in skills computer
 2015-09-01 12:25:29 +02:00
Cael Aislinn
0228ca4959 fix for runtime in skills computer 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-09-01 20:05:42 +10:00
Chinsky
667debfb3c Merge pull request #10745 from mwerezak/mob-grab 
Cleans up mob_grab.dm
 2015-09-01 12:58:50 +03:00
Chinsky
cf0a3f94d0 Merge pull request #10808 from Hubblenaut/dev 
Bar drinks
 2015-09-01 12:56:54 +03:00
Chinsky
28cf860332 Adds revolver spin sound. 2015-09-01 12:18:49 +03:00
Zuhayr
cc0f4f7e90 Merge pull request #10964 from caelaislinn/telecomms_fix 
Fixes an obscure runtime in telecomms code
 2015-09-01 13:56:41 +09:30
Zuhayr
1362271e60 Added short-sightedness for species, added groundwork for variant species sight flags. 2015-09-01 11:42:33 +09:30
Zuhayr
bd76f977da Added a complex holder for human mobs + example icons (for an unadded species) 2015-09-01 11:39:22 +09:30
Zuhayr
3f6f34c16f Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/mob/holder.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	icons/mob/head.dmi
 2015-09-01 11:22:10 +09:30
Zuhayr
7581717246 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	maps/exodus-1.dmm
 2015-09-01 10:55:19 +09:30
Atlantis
e0a70d24ba Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2 2015-09-01 03:22:08 +02:00
Atlantis
d12002c536 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapfixes 2015-09-01 02:57:36 +02:00
GinjaNinja32
9667eac972 Merge pull request #10961 from PsiOmegaDelta/150831-OpenFire 
Ports the portable turret projectiles to the new system.
 2015-08-31 20:57:55 +01:00
GinjaNinja32
2d4c56a41e Merge pull request #10940 from Zuhayr/dev 
Limbs now copy hair data from their owner and may have optional body hair icons blended into them.
 2015-08-31 20:57:40 +01:00
GinjaNinja32
09fd54e12c Merge pull request #10959 from PsiOmegaDelta/150831-GetThatTurf 
Ports LummoxJr's get_turf()
 2015-08-31 20:57:02 +01:00
Raptor1628
a7ff1a09ee Adds Supply Fax 
Quartermaster now has fax access and a fax machine. Fax machines have a
third admin channel, "Supply" for special requests like three thousand
mankinis or a Phazon, up to the admins to accept or deny requests, and
deduct cargo points if they'd like to.
 2015-08-31 15:32:35 -04:00
Cael Aislinn
8f05e2f63a fixes an obscure runtime in telecomms code 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-08-31 18:57:42 +10:00
Zuhayr
7f97527471 Merge pull request #10581 from Kelenius/ofMechfabAndPanic 
Updates mechfab
 2015-08-31 17:39:04 +09:30
Kelenius
57ab846273 Merge branch 'dev' into ofMechfabAndPanic 
Conflicts:
	maps/exodus-1.dmm
 2015-08-31 10:57:04 +03:00
Zuhayr
f86eba984c Merge pull request #10962 from caelaislinn/remote_emitter_fix 
Fixes runtime in remote emitter activation button
 2015-08-31 17:25:57 +09:30
Cael Aislinn
9f1407c196 fixes runtime in remote emitter activation button 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-08-31 17:45:20 +10:00
PsiOmega
337333d45e Ports the portable turret projectiles to the new system. 2015-08-31 09:10:58 +02:00
Zuhayr
9f54a71c2c Limbs now copy hair data from their owner and may have optional body hair icons blended into them. 2015-08-31 16:34:13 +09:30
PsiOmegaDelta
f35e614150 Merge pull request #10958 from caelaislinn/emitter_fix 
Fixes emitter runtime by using new calling syntax
 2015-08-31 08:58:07 +02:00
Zuhayr
14c57fcf11 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/holder.dm
	icons/mob/head.dmi
 2015-08-31 16:17:24 +09:30
PsiOmega
af86b8a935 Ports LummoxJr's get_turf() 2015-08-31 08:45:20 +02:00
Cael Aislinn
1de511b545 fixes emitter runtime by using new calling syntax 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-08-31 16:41:43 +10:00
Joseph Heinemeyer
8c61c3ab6f Fixes multi-z things. 2015-08-30 18:58:37 -07:00
Zuhayr
ac04bdfb52 Readded monkey scooping. 
Conflicts:
	code/modules/mob/living/carbon/human/species/species.dm
 2015-08-31 07:01:56 +09:30
SkyMarshal
772c320303 Multi-Z. 2015-08-30 14:15:20 -07:00
GinjaNinja32
491bb6931a Merge pull request #10944 from PsiOmegaDelta/150830-Cleanup 
Removes duplicate definitions.
 2015-08-30 19:18:53 +01:00
Neerti
067bfc0de5 Merge pull request #181 from Mark9013100/endondeath0 
Rounds no longer end on antag death
 2015-08-30 13:11:38 -04:00
Datraen
fa566fbe47 [Botany] Gas-related traits revealed on the plant analyzer 
http://baystation12.net/forums/threads/the-little-things-4-with-a-vengance.9/page-11#post-10909
 2015-08-30 11:58:39 -04:00
PsiOmega
0bd41e604b Merge remote-tracking branch 'upstream/dev' into Backup 2015-08-30 15:55:10 +02:00
PsiOmega
080e07976a Removes duplicate camera network definitions. 2015-08-30 15:51:05 +02:00
PsiOmega
6165b6fee3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/material/shards.dm
 2015-08-30 10:23:14 +02:00
PsiOmegaDelta
88250ad57f Merge pull request #10939 from Baystation12/master 
Dev-freeze
 2015-08-30 10:20:32 +02:00
Cael Aislinn
d41083cfae resolves issue with space and unsimulated turfs being odd and dark 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-08-30 15:27:04 +10:00
Mark9013100
1d736b368e Rounds no longer end on antag death 2015-08-30 00:52:38 -04:00
Zuhayr
92d3e6d240 Fixes Yongauni#155 2015-08-30 11:45:54 +09:30
Chinsky
bfa54052f8 Merge pull request #10891 from Peliia/Peliia-patch-1 
Virology Tiny Fixes
 2015-08-29 23:27:15 +03:00
Chinsky
9edeb3cc08 Merge pull request #10908 from Matthew951/8-27-2015-adds-Volaju-hair 
Adds a new set of hair and facial hair
 2015-08-29 23:26:30 +03:00
PsiOmegaDelta
f707050c0f Merge pull request #10926 from Sligneris/patch-1 
"Junior Officer" alt-title
 2015-08-29 18:23:16 +02:00
PsiOmega
e1aa20fda5 Radio changes. 
Removes the radio free range option.
Instead all users can move within the standard radio frequency range, while authorized users can also select department channels.
 2015-08-29 17:12:48 +02:00
Atlantis
4189fc3ff6 Adds defines for atmospherics tanks values 2015-08-29 15:53:13 +02:00