cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-05-23 07:07:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,117 Commits 8 Branches 26 Tags
4e4ee34ec82d77de4bc41d1dce9c5606ed3d6416
Commit Graph

307 Commits

Author SHA1 Message Date
Zuhayr b3c0079e18 Merge pull request #4004 from volas/master 
Minor fixes
 2013-12-05 02:56:06 -08:00
volas e33490d80a Fixes: AI won't steal fax, and mice won't flip tables anymore. 2013-11-30 23:54:06 +04: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
Nanai a8f1ee6c91 Girder health/laserkill fix 
Allows girders to be broken by repeated laser shots to stop abuse against laserfire. Also, for actually being able to lase through walls if they're open.

Resolves issue #3796
 2013-11-23 18:50:15 -05:00
Zuhayr 185c83b287 Fixes #3642 2013-11-24 09:22:50 +10:30
DJSnapshot 7665a1a00e Merge pull request #3895 from Baystation12/master 
Merge Dev with Master
 2013-11-07 16:31:43 -08:00
Chinsky b7edb181ed Where can I get my idiot certificate. 2013-11-05 03:59:39 +04:00
Chinsky 98ba7e4699 Fixes zombie goast tableflips 2013-11-04 22:36:22 +04:00
Mloc-Argent f1b230edc4 Merge branch 'master' into dev 2013-11-04 10:46:13 +00:00
Iamgoofball a75492d26b Startoad's plasma windows commit, I'm doing the github stuff for it. 
https://github.com/StarToad/Baystation12/commit/3677121b51af852ed951c214c57a08fab60222c1
 2013-11-01 18:53:45 -07:00
Cael Aislinn a4e5bad409 fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 05:10:17 +10:00
Segrain 858df5ca64 Fix for #3804. 2013-10-24 19:16:54 +03:00
Segrain 8bd055357a Same fix again. 2013-10-21 04:48:07 +03:00
Segrain 121b10b16c Conflict fix. 2013-10-21 04:37:28 +03:00
Segrain ace205b323 Code cleanup. 2013-10-18 08:40:45 +03:00
Chinsky 930a30cfd0 Moved stuff from /structure to /obj/structure because I am tired of accidently going inside of it for unused file and empty file 2013-10-16 12:51:30 +04:00
Chinsky 55ea60a785 Fixed derpy type of psych couch 2013-10-16 12:50:40 +04:00
Chinsky f3028d3edd Attempted fix #3769 
Var is fine in one line, null in next one. Cannot feasibly prevent that without slapping nullcheck before EVERY mention on that var, so going to just add some sanity checks and call it a day
 2013-10-16 11:28:41 +04:00
Segrain 21718c5bac Fix for #3764. 2013-10-13 03:44:43 +03:00
Mloc 1b9e5c81ea Merge pull request #3756 from comma/tableflip 
Tableflips & cover system
 2013-10-11 11:36:31 -07:00
Chinsky a18fbaac1d Cover system. 
Tables now give some cover from bullets and beams.
Standing behind the table gives you 20% chance of table taking the hit instead.
Flipped table gives +20%, but only if bullet comes from the side it faces. Otherwise no cover is provided at all.
Lying on the floor gives +20%.

Table takes half of damage human would, and breaks down after its health goes to zero.
Reinforced talbes have double the health, wooden ones - half.
 2013-10-11 22:17:45 +04:00
Chinsky fadc121dac Can flip weakened reinforced table now too. 2013-10-11 10:52:24 +04:00
Chinsky c30693dfcf Flipped tables now have 20% chance to take damage instead of whatever is behind them. 2013-10-11 02:48:41 +04:00
Chinsky daba423428 Tableflips! 
You can now flip non-reinforced straight, 1-tile wide tables.
Complete with ugly codersprites for flipped tables.
 2013-10-11 02:13:59 +04:00
Chinsky e1d2dd4aa1 Coat racks. Can hold either labcoat or detective coat. 2013-10-10 15:33:02 +04:00
Chinsky b78141e413 Merge branch 'dev' into coathanger 2013-10-10 14:42:42 +04:00
Chinsky cf69a5797d WIP coat rack 2013-10-10 13:49:42 +04:00
Chinsky 3c7c715e06 Merge pull request #3727 from fauxki/dev 
Dev - Lightswitches for Medbay / Beach Holodeck Update
 2013-10-08 21:23:42 -07:00
Mloc-Argent 65f218ee63 Merge branch 'master' into dev-freeze 
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 22:01:16 +01: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
Mloc-Argent 8b2c3fc153 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:24:21 +01:00
fauxki a9de4f00f2 * Adds swimming fins, flotation ducky belt, and snorkel to code. Two of the fins and snorkels will spawn in the athletics closet with the swimming suits. The flotation device spawns on the beach holodeck. 2013-10-05 08:25:03 -07:00
Mloc 49c0a30301 Merge branch 'master' into dev 
Conflicts:
	baystation12.dme
	html/changelog.html
 2013-09-26 10:26:03 +01:00
Mloc-Argent e9bf414820 Refactors code to work with BYOND 500. 
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-22 12:39:48 +01:00
Segrain 35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03:00
Lethal Ghost 09dc90c46b Fix for stool picking up. 2013-09-13 00:23:16 +06:00
Zuhayr 7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Zuhayr c7942b7eaf Merge pull request #3651 from SkyMarshal/airfixes 
ZAS update, needs testing.
 2013-09-07 05:46:04 -07:00
SkyMarshal e8f9d19c75 Completed ZAS rework. Needs testing, and consideration to make zones sleep. 2013-09-03 20:25:03 -07:00
SkyMarshal 073f462e1b WIP ZAS rework. 2013-09-03 20:25:02 -07:00
Erthilo 3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Mloc-Argent a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo 547c1e670d Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work. 2013-08-31 20:12:19 +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 7dae19a3f9 Fix for #3498. 2013-08-30 04:40:39 +03:00
Zuhayr dabd0866a2 As above. 2013-08-28 23:34:12 -07:00
Zuhayr c17347ef77 Added CubeJackal's security gear to the appropriate lockers. 2013-08-28 22:31:22 -07:00
Mloc 4d928843b1 Merge pull request #3609 from Zuhayr/dev 
Stuff from dev-freeze.
 2013-08-28 10:40:58 -07:00
Erthilo 5437b1bbac Added two ears back. 2013-08-27 22:05:27 +01:00
meyar c0d264fed7 Fixes fire lockers. They actually start with stuff in them. 2013-08-23 20:39:08 -04:00