cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 13:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,384 Commits 9 Branches 26 Tags
b3cebd2b021c7e075d3cf069ece8da338bf46aaa
Commit Graph

1286 Commits

Author SHA1 Message Date
Eearslya
85c3e22873 Polaris sync 2016-08-06 20:34:44 -07:00
Anewbe
a9b093bcec Sprays now respect blocking 2016-07-30 02:16:25 -05:00
Yoshax
f90f2ec08a Fixes some items on working on people on tables 2016-07-26 03:10:54 +01:00
Anewbe
612a6f8328 Merge pull request #2149 from SinTwo/item_state 
Item State Cleanup
 2016-07-23 15:53:36 -05:00
Yoshax
baa25044c3 Ensures drinking glasses have a cost in the autolathe 2016-07-23 20:15:22 +01:00
SinTwo
4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
 2016-07-22 23:39:19 -04:00
Yoshax
b2a704904c Removes adverse effects to Tajaran drinking coffee 2016-07-22 18:07:08 +01:00
SinTwo
c1bd0aa6b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/modules/clothing/clothing.dm
 2016-07-19 17:37:14 -04:00
Neerti
ba33340ce0 Merge pull request #2099 from Anewbe/tricord_nerf 
Halves the effect of Tricordrazine
 2016-07-15 07:07:14 -04:00
SinTwo
976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
 2016-07-13 17:07:52 -04:00
Anewbe
52a7c0d797 Speeds up toxin 2016-07-11 22:04:15 -05:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
mwerezak
108a748d1f Fixes pepperspray making sounds even when the safety is on 2016-07-11 04:54:40 +01:00
Anewbe
3ac6d351ff Halves the effect of Tricordrazine 2016-07-10 21:45:16 -05:00
Neerti
61e291a083 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-07-08 21:00:12 -04:00
Neerti
8a61641479 Some more work + prep for drydocking. 2016-07-08 20:38:34 -04:00
EmperorJon
5b3c952be9 Merge pull request #2039 from SinTwo/smallfeatures 
Water-Coolers, Floor Lamps, and Benches
 2016-07-08 09:54:11 +01:00
SinTwo
5c4c283b80 changelog and span tags 2016-07-07 20:38:46 -04:00
Yoshax
a3b1363b2c Adds new non-alcoholic drinks 2016-07-07 21:51:30 +01:00
Mloc
7377f57e5d adds bun-bun, a bread monkey made with two burger buns 
Signed-off-by: Mloc <colmohici@gmail.com>
 2016-07-05 18:19:05 +01:00
SinTwo
386ceb2bc5 makes water-cooler bottles attainable through in-game means 2016-07-04 18:17:53 -04:00
Arokha Sieyes
ec07dbbb7d Compatibility tweaks for new Polaris sync 2016-07-03 17:21:03 -04:00
Arokha Sieyes
484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
 2016-07-03 16:21:21 -04:00
Datraen
684fb4e23d Fixes runtimes resulting in chem masters not filling bottles when sprite is never changed. 2016-07-01 12:51:10 -04:00
SinTwo
c7db22b985 water cooler fixes 2016-06-29 16:36:43 -04:00
Datraen
a10f525638 Adds compatability with cooking code 2016-06-29 15:40:34 -04:00
Datraen
c7693e0eab Corrects ChemMaster Bottle Sprites. 2016-06-27 14:28:29 -04:00
SinTwo
2642bc1628 changelog and chemmaster fix 2016-06-23 15:01:17 -04:00
SinTwo
244fb40de8 Fixes part 1 2016-06-20 23:32:18 -04:00
SinTwo
8ecc72412d minor fixes and icon adjustment 2016-06-19 23:30:46 -04:00
SinTwo
da38eca686 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into featureattack 2016-06-19 22:28:31 -04:00
SinTwo
86e500d25c Adds floor lamp, benches, new tank sprites, and cup dispenser on water coolers. 2016-06-19 22:28:01 -04:00
Richard D'angelo
7ab5220f64 510 Improved Overlays 
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.

I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.

Ported from:

7c2cc890ab
 2016-06-18 15:50:10 -03:00
Spades
05ce93721b Forgot one part. 2016-06-17 19:50:16 -04:00
Spades
1057034044 Fixes #371 2016-06-17 17:05:36 -04:00
HarpyEagle
58b87f1a4b Adds do_surgery() behaviour for various items 
Heath scanners, autopsy scanners, syringes, hyposprays, droppers and bottles.
 2016-06-17 19:06:56 +01:00
Arokha Sieyes
0350a266d1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	code/modules/client/preferences.dm
 2016-06-14 12:01:42 -04:00
Yoshax
3e0745677f Fixes chocolate milk and milk 2016-06-13 20:20:07 +01:00
Arokha Sieyes
878cf928f8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	.travis.yml
#	vorestation.dme
 2016-06-13 13:12:40 -04:00
Yoshax
730fceb2d7 Makes Datraen happy 2016-06-09 17:23:43 +01:00
Yoshax
52f8c6a344 Ensures retail scanners work with drinks 2016-06-09 17:08:07 +01:00
Cameron653
dd12233925 Update Chemistry-Recipes_vr.dm 2016-06-08 19:02:27 -04:00
Cameron653
91d024288e This should fix \blue 2016-06-08 18:46:35 -04:00
Cameron653
1a11d26ae2 Fixes \red 2016-06-08 18:42:00 -04:00
Cameron653
700222f40a Travis refused to work while these were in, so I 
Had to remove them. I can possibly bring them back sooner or later, but
not right now.
 2016-06-08 02:57:16 -04:00
Cameron653
92e1f0856f Travis, please. 2016-06-08 02:54:58 -04:00
Cameron653
fbec152c6a Travis should work, now. 2016-06-08 02:51:50 -04:00
Cameron653
6d3f9be055 Makes the code a bit better 2016-06-08 02:44:31 -04:00
Cameron653
2b380da2ae Looking back, fire should cost more. 2016-06-08 02:22:30 -04:00
Cameron653
8c92c1b25b Adds in "slime core" reactions to xenobiology 2016-06-08 02:15:10 -04:00