cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 12:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,735 Commits 9 Branches 26 Tags
cfdb3288e76d6bdede95dffbf68bbe53069e73bc
Commit Graph

1275 Commits

Author SHA1 Message Date
DJSnapshot
a4fc2b04a2 fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work) 2014-07-25 16:56:56 -07:00
Zuhayr
ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
Whitellama
342a187c8b Eating with utensils now produces the eating sound, fixed #5687 2014-07-19 18:33:30 -07:00
Mloc-Hibernia
281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2014-07-18 13:08:12 +00:00
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
Walter0o
6c62e9e56b should fix #5618, trivial kitchen utensil bug 2014-07-16 20:28:19 +02:00
mwerezak
f2845dbe76 Thrown items can be targeted, has miss chance... 
...based on distance, similar to projectiles.
 2014-07-15 01:14:04 -04:00
Chinsky
d59e5b8da2 Merge pull request #5603 from DJSnapshot/hotfix 
Changing URL of Corporate Regulations to the new Corporate Regulations
 2014-07-14 07:12:37 +04:00
Zuhayr
5f8723352d Merging robot_modules.dm and master controller setup. 2014-07-14 09:10:02 +09:30
DJSnapshot
743ac61155 Little Slip-up 2014-07-13 13:30:36 -07:00
DJSnapshot
5063178aa6 Changed URL to Corporate Regulations 2014-07-13 13:29:19 -07:00
Chinsky
4e371f7af7 Merge pull request #5585 from SparklySheep/patch-3 
Fuk da law
 2014-07-13 08:56:54 +04:00
mwerezak
c0487b9c90 Fixes human internal organs list 2014-07-12 16:15:37 -04:00
SparklySheep
55c7fbe739 Changes Space Law book to Corporate Regulations 
Because fuck anyone that thinks "Space Law" is a good name for a roleplaying server.
 2014-07-12 10:26:54 -05:00
Walter0o
5289776e33 removes sharpness from forks 
too commonly available to enjoy the sharp bonus.
 2014-07-10 19:47:59 +02:00
Mloc-Argent
64d2a69a32 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
 2014-07-06 17:50:53 +01:00
Hubblenaut
dfece9fe12 Stops buckled mobs from slipping (for now) 2014-07-02 22:36:49 +02:00
Mloc-Argent
6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm
 2014-06-30 23:44:46 +01:00
Chinsky
145bfe9770 Implemented suggestions from PR 2014-06-29 19:24:19 +04:00
Chinsky
a6c7093818 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robust-squash 
Conflicts: lots
 2014-06-29 19:16:36 +04:00
Higgin
2556d3f227 Stunbatons now run on charge. 
Adds improvised weapons.
Increases unarmed stun time, decreases push stun time.
Increases melee embedding chance.
 2014-06-29 17:46:06 +04:00
volas
4528f109a5 Fix infinite loop in freeform AI module 2014-06-25 23:09:21 +04:00
Chinsky
7e56df8689 Merge pull request #5308 from mwerezak/wound-infections 
Re-enables infections, implements a wound infection system, improves body temperatures
 2014-06-22 22:04:25 +04:00
Zuhayr
1cfb9b6ea1 Merge branch 'master' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-22 21:58:46 +09:30
Zuhayr
bb8951a53c Makes forks usable. 2014-06-22 21:49:55 +09:30
mwerezak
b9fa433087 Adds suit cooling device 
Also:

Breathing in hot/cold air will affect your body temperature.
Fixes old body temperature stabilization code not working.
Thermometer icon now adjusts based on species.
Reduced BODYTEMP_AUTORECOVERY_MINIMUM to a less ridiculous value.
 2014-06-21 16:53:18 -04:00
Ccomp5950
68d01b00ab Merge pull request #5297 from comma/fancy 
Nextgen lights
 2014-06-20 20:30:11 -05:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
 2014-06-20 22:02:40 +01:00
Zuhayr
33fa88e27a Merge pull request #5309 from mwerezak/flashbang 
Fixes #5186
 2014-06-20 21:23:34 +09:30
mwerezak
25e333a39b Fixes #5186 2014-06-20 02:48:12 -04:00
Chinsky
2396c6d882 Nextgen lighting #2: Lights 
Can paint light tubes and bulbs with paint and stick in sockets to get colored lights.
 2014-06-18 20:38:33 +04:00
Chinsky
fc73c8de22 Changes paint tile coloring to use color var, less icon procs. 2014-06-18 20:20:18 +04:00
Boop
4b7a8610b8 Fix latex gloves box not having the right sprite 2014-06-18 13:32:10 +01:00
Zuhayr
342bee81d4 Merge pull request #5284 from boopcat/happydrones 
more fixes!
 2014-06-18 08:58:00 +09:30
Boop
a903e400dd Fixes #5088 
also fixes more runtimes that mloc gave me
 2014-06-17 20:35:48 +01:00
Chinsky
be95e54e43 Merge branch 'master' into dev 
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-06-17 16:16:44 +04:00
Chinsky
dd4a937ca9 Merge pull request #5275 from GinjaNinja32/lighters 
Fixes cheap lighters burning body parts other than the hands they're being held in
 2014-06-17 14:43:24 +04:00
GinjaNinja32
fcdd0198c0 Fix lighter burning random body parts 2014-06-17 04:50:14 +01:00
mwerezak
6dee9cf65d Adds sharp and edge flags to appropriate items 
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
 2014-06-16 13:26:44 -04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
 2014-06-15 20:25:39 -04:00
Zuhayr
80db3a284b Merge pull request #5216 from Loganbacca/trainmerge 
Cargo Trains
 2014-06-14 17:13:55 +09:30
Zuhayr
136ccc347b Merge with dev. 2014-06-12 01:14:40 +09:30
igalan
7d08d4701c Hydroponics refactor, part 1: Files. 
No code actually modified, just moved from all over the place to a module folder.

defines/obj/hydro.dm split:
-Seeds into seeds.dm
-Tools like the analyzer, pest and weedkillers into hydro_tools.dm. Hatches and scythe from defines/obj/weapon.dm moved there too.
-Non-edible plants like nettles into grown_inedible.dm. Special procs in items/weapons/hydroponics.dm moved there.
-Biogenerator and hydroponics tray files moved.
 2014-06-11 03:44:29 +01:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Hubblenaut
5098c6a85c Makes crashing into things possible with extinguisher or harm intent 2014-06-05 22:49:38 -04:00
Loganbacca
7d7d095e5c New vehicle framework 
- Implements a new vehicle framework
- Adds cargo trains
 2014-06-03 22:18:49 +12:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Zuhayr
a7c3c67da8 Fixes #5098 2014-06-01 21:09:30 +09:30
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
Zuhayr
a29861480a Fixes #5023 2014-05-28 16:35:06 +09:30