cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 21:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,198 Commits 9 Branches 26 Tags
cc615ee06d524de9943c2ebcd4a01b5f615d5b6d
Commit Graph

3750 Commits

Author SHA1 Message Date
Ccomp5950
cc615ee06d Merge pull request #4963 from mwerezak/accessory-fix 
Accessories
 2014-05-12 11:43:05 -05:00
Zuhayr
c2616e3744 Fixes lack of update on drone fabricator console. 2014-05-12 13:18:52 +09:30
Zuhayr
b6a3c8a761 Fixes drone regeneration of materials issue. 2014-05-12 13:00:25 +09:30
Zuhayr
e0063c271b Fixes 'resource depleted' error for emagged drones. 2014-05-12 12:51:43 +09:30
Zuhayr
10ebe3b8b2 Fixes the decompiler. Adds spiderlings, broken globes, mice and lizards as valid targets. 2014-05-12 12:42:09 +09:30
Zuhayr
5295b9ee2e Readds drone held icon that got lost somewhere in merges. 2014-05-12 12:17:11 +09:30
Zuhayr
3afbae1479 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-11 22:53:37 +09:30
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
 2014-05-11 13:19:09 +00:00
Zuhayr
5b32b111d6 Double whoops. 2014-05-11 22:34:34 +09:30
Zuhayr
45255e9e2e Whoops. 2014-05-11 22:07:24 +09:30
Zuhayr
a570f02835 Removed a redundant line. 2014-05-11 22:03:28 +09:30
Zuhayr
538bba9c42 Join As Drone and drone rebooting will now check cyborg jobbans. 2014-05-11 21:38:45 +09:30
Mike
6e391c01c9 Accessories are now visible when attached 
Uses overlays.

I was originally planning to use the SOUTH direction of the
icons/mob/ties.dmi image as the overlay, however this had problems with
the fact that those images are directional. Rather than override Move()
in clothing/under to reset dir to SOUTH whenever clothing with an
attached accessory was thrown or dragged, I thought it would be less
hacky to read the overlays from a separate .dmi.
 2014-05-10 22:30:09 -04:00
Mloc-Hibernia
1d2ce01039 mob: fix #4955 
Name parameter to track wasn't sanitized correctly.

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-05-10 22:33:33 +00:00
Chinsky
3e52109077 Merge pull request #4949 from Zuhayr/master 
Fixes.
 2014-05-10 13:02:23 +04:00
Ccomp5950
4243b1ed61 Merge pull request #4943 from Intercross21/master 
Special color for antagonists in logs and fix of alien whitelist
 2014-05-10 03:17:15 -05:00
Zuhayr
a68c4e9c55 Fixes #3993 2014-05-10 10:26:05 +09:30
Zuhayr
1fc3ecf145 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 2014-05-10 01:40:11 +09:30
Zuhayr
a95dd47de3 Fixes #4744 2014-05-10 00:40:20 +09:30
Zuhayr
1e63e27f3b Fixes #4918 2014-05-10 00:27:18 +09:30
Intercross21
1f261fdadd Fix for alien whitelist 2014-05-09 09:20:55 +04:00
Mloc-Argent
2d99a65cdf Merge remote-tracking branch 'upstream/master' into dev 2014-05-08 19:27:02 +01:00
Mloc-Argent
a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00
Ccomp5950
1861c7607f Stops muzzled folks from talking. 2014-05-06 21:38:47 -05:00
DJSnapshot
c0a53c52b7 Merge pull request #4913 from Zuhayr/master 
Changeling, nymph and robot fixes.
 2014-05-06 16:25:31 -07:00
Ccomp5950
6f71b8bf10 Merge pull request #4901 from Jarcolr/magicmissiles 
Removes unusable magic missiles from artificers spell tab
 2014-05-05 21:38:54 -05:00
Mloc-Argent
6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Zuhayr
051edb4fc1 Fixes #4421 2014-05-05 16:57:27 +09:30
Zuhayr
ffdba855fa Fixes #3741 2014-05-05 14:50:22 +09:30
Zuhayr
48262ae9dc Robots will now take burn damage from appropriate projectiles, rather than recieving brute. 2014-05-05 14:49:25 +09:30
Ccomp5950
c8c67da6ac Dionaea nymphs now using new say code and get languages again. 
dionaea will understand and be understood by humans if they have stolen any blood, it's assumed they learned common.

and a minor fix in hear_say for observers to not get not see simple_animals in (parens) since they have no real_name.
 2014-05-04 16:11:10 -05:00
Ccomp5950
93bee94c10 Saycode herp derp. client check checking speaker client instead of hearers. 2014-05-04 09:27:14 -05:00
Mloc
ce376eda1d Merge pull request #4894 from Zuhayr/master 
IPC fixes.
 2014-05-04 13:49:00 +01:00
Jarcolr
4ac2f5f136 Removes unusable missiles from artificers 2014-05-04 01:28:24 +03:00
Mloc
c05547820d Merge pull request #4883 from mwerezak/hidetail-dev 
Added HIDETAIL flag for suits
 2014-05-03 17:04:32 +01:00
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 16:56:19 +01:00
Ccomp5950
d2b5f24545 Trimming messages prior to say code processing. 
Hoping to fix any whitespace issues that stop processing of emotes and radio/language channels
 2014-05-03 08:44:26 -05:00
Zuhayr
3d693a5f38 Several IPC adjustments. 2014-05-03 21:29:10 +09:30
Mloc-Argent
56ea5c26bb mob: fix for say code "randomly" breaking 
There was a runtiming check for mob.locs[1] in living/say, that would
fail if a mob was in bluespace.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-02 22:28:21 +01:00
Mike
01a5e64e65 Added HIDETAIL flag for suits 2014-05-02 11:53:31 -04:00
Ccomp5950
df0fe76155 Ooops fix, "right_ear" should be "right ear". 2014-04-30 04:03:55 -05:00
Ccomp5950
7f5b5bb5af Merge pull request #4851 from thelegendofbrian/pAI 
pAI GUI Massive Update
 2014-04-29 18:49:54 -05:00
Brian Cook
96d1609bda Reverted "Paroled" to "Parolled" 
To avoid conflicts with other variables and spellings.
 2014-04-28 20:20:30 -07:00
Brian Cook
6b16a4140c Added missing header to pAI Request Module 
Also changed max frequency of radio config to 159.9 instead of 159.1
 2014-04-28 16:56:39 -07:00
Brian Cook
67da07445b Added refresh button to host bioscan page 
Also tweaked all pAI GUI so the background doesn't repeat-y
 2014-04-28 13:26:52 -07:00
Ccomp5950
c8f98337a4 Radio :r and :l fixes and feature. 
If you have a hand held radio in your right hand and use :r it will send through it.
If you have a radio on both ears and no radio in your hand and use :r it will use the right side ear radio.

Priority is given to the radio in the hand over the ear but this fix should make both side happy, those that want it to be ears and those tht want it to be hand helds.
 2014-04-28 02:50:38 -05:00
Brian Cook
381a61d6be Centered background on pAI GUIs 2014-04-27 05:22:36 -07:00
suethecake
beea526685 Few bugfixes - namely species hair still having do coloration = 0 and the tail rendering over equipment. Tajaran and Unathi sprites are also now black to facilitate more vibrant colors. 
Trying to color them while dark green and brown-grey ended up in odd colorations. Quality of life change.
 2014-04-27 04:05:55 -06:00
suethecake
2b2d64f05f Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY! 2014-04-27 01:00:16 -06:00