cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,574 Commits 9 Branches 26 Tags
v0.1.13
Commit Graph
357 Commits
Author SHA1 Message Date
Walter0o 361609cacd should fix #5692 
untested, but seems like a simple derp bug
 2014-07-19 23:22:28 +02:00
Mloc-Argent a33cb7272b Merge remote-tracking branch 'upstream/master' into dev 2014-06-23 20:57:47 +01:00
mwerezak 37e63dfcb0 Fixes FEA temperature_expose() being used... 
...instead of ZAS fire_act().
 2014-06-22 00:13:22 -04:00
Chinsky 9e8b124037 ixes #5075 
Mech fabricator redefined check access for no reason, let base proc handle it.
Adds span classes for messages guestpass console gives.
 2014-06-17 18:25:39 +04:00
Zuhayr 4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
Zuhayr 78918e4795 Entirely removed the Honker mech, other refs to bananium, adamantine and mythril. 2014-06-08 00:52:20 +09:30
Zuhayr c2f2a7cde6 Refactored material definitions a little bit, removed all bananium from the codebase. 2014-06-08 00:40:34 +09:30
mwerezak 715056fca7 Readds tator fab to drone bay 2014-06-03 20:01:16 -04:00
Mloc-Argent ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00
Walter0o c9ec1fc001 fixes exploits with the mech fabricator (bay12) 
this exploit is in all public builds i could look at.

using the mech fabricator, and you were able to duplicate any obj in the server.

as a nice bonus you could also abuse the part-description-function to identify any atom in the server
memory for even easier access to other yet unknown exploits of this kind.

and also range check was missing to make sure you are not on some other z level massproducing guns.

i will not go into details, as it is exactly the same kind of exploit over and over, 
so if you are interested on how and why these exploits work, see some of my other exploit commits :
https://github.com/Baystation12/Baystation12/pull/5068
https://github.com/Baystation12/Baystation12/pull/4750

i advise any coder team to be supercautious when changing/writing new Topic procs to prevent these,
and to always doublecheck other coder's works.
 2014-05-28 22:05:29 +02:00
Ccomp5950 976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-25 21:14:58 -05:00
Ravensdale 68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-16 21:44:26 -07:00
Ravensdale 1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
Jarcolr 868dea5681 Grammar patch 1 
This is just the first one of many.
 2014-04-08 14:48:31 +03:00
DJSnapshot 1a50dddbd4 replaced electrodes with insta hit taser beams. 2014-04-05 17:13:09 -07:00
Joey Haas 2063909ab0 Fixed the bug where mech fabricators would get stuck whenever the RnD console was not found. 2014-03-04 23:51:12 +01:00
Loganbacca ec3ae41708 Mech fab upgrade fix 
Nano manipulators were not lowering build time at all.
Stock and Pico manipulaors were lowering build time by 6%.

This fixes that. Now: Stock = standard build time, Nano = 6% faster, Pico = 12% faster.
 2014-02-19 12:49:27 +13:00
DJSnapshot 1e4abf785e Merge pull request #4237 from Mloc/bs12-tgstuff 
[TG] Lots of small (and maybe not so small) changes from tg.
 2014-01-09 22:33:28 -08:00
Mloc-Argent dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
SkyMarshal 2308e71157 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 2014-01-08 21:33:17 -07:00
RazharasandMloc-Argent 3e476a5507 Fixes mechs click through windows and what not 
I ded plz fix
 2014-01-08 19:36:10 +00:00
Cluwnes HonkandMloc-Argent dda4403e21 Succesful fixes 
Fixes instances of "succesful" and "succesfully".

Conflicts:
	code/game/machinery/computer/ai_core.dm
	code/game/mecha/mech_fabricator.dm
 2014-01-08 19:30:28 +00:00
Zuhayr b0b038873f Medical HUDs will now only show brainworms if the worm is controlling the host. 2013-12-19 11:00:21 +10:30
Zuhayr c5849aaa96 Added cortical borers to the various HUDs. 2013-12-18 14:03:04 +10:30
DJSnapshot 2203309fcc Merge pull request #4006 from Baystation12/master 
merge master into dev-freeze
 2013-11-30 15:22:31 -08:00
Ccomp5950 a8738ddc4b Players will now no longer be able to jump in exosuits while handcuffed. 2013-11-28 21:35:04 -06:00
Mloc 503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2013-11-24 23:37:09 +00:00
Zuhayr f26f64efad Fixes #3643 2013-11-22 23:47:23 +10:30
Ccomp5950 4ccf7d0a08 Bugfix (3778) Power cells in exosuits have the same amount of power as a highcap cell 
Issue:  Mechs are created/spawned with a high-capaciter cell that is named "Power cell" and confuses some of the less bright roboticists and their beards.

Solution:  Shave the roboticist, and also renamed the cell that spawns to properly reflect it's higher capacity.
 2013-11-15 22:07:08 -06:00
Chinsky fd928d4b5f Cleaned the fuck out of smoke. 2013-11-05 02:57:23 +04:00
Segrain da0716adb3 Merge remote-tracking branch 'upstream/master' into dev 2013-10-13 03:33:26 +03:00
Segrain f2bbc60d51 Order fix. 2013-10-12 21:19:54 +03:00
Segrain b39dfc5229 Smallfix. 2013-10-12 19:49:29 +03:00
Segrain 77748f1116 Mecha weapons. 2013-10-12 14:41:24 +03:00
Segrain 34a6735ef8 ERT mecha beacons. 2013-10-12 14:31:12 +03:00
Mloc-Argent a1f55a50b1 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 20:27:39 +01:00
Erthilo 235e09d2b9 Changed icon path for custom items due to compile times. 2013-09-01 13:24:38 +01:00
Erthilo 4f4fb38baf Changed pin to a 4 digit number. Game year standardised to this year +544. 2013-09-01 13:23:23 +01:00
Erthilo b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
 2013-08-31 17:45:31 +01:00
Segrain 8d1fdd87b3 Typecheck fix. 2013-08-29 02:24:40 +03:00
Erthilo 5437b1bbac Added two ears back. 2013-08-27 22:05:27 +01:00
Segrain acb4a01b9d Compile fix. 2013-08-23 10:42:29 +03:00
Mloc-Argent 1106845cb6 further checks against mobs being loaded by hydraulic clamps. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-22 15:54:28 +01:00
comma e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm
 2013-08-04 01:40:32 +04:00
Erthilo 9bbf43407f Fixes Gravitational Catapult not detaching. 2013-07-30 20:06:37 +01:00
Segrain ea320dca67 Conflict fix? 2013-07-29 08:15:54 +03:00
Segrain 85f82219ba Fix for #3345. 2013-07-25 03:03:14 +03:00
Mloc-Argent 2123389f94 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2013-07-22 14:42:31 +01:00