cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 04:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,582 Commits 9 Branches 26 Tags
24ef7752cdfe62f5a55ee9ac08fffdf7be0954c5
Commit Graph

4333 Commits

Author SHA1 Message Date
Kelenius
24ef7752cd Merge branch 'Baystation12/dev' into ofChemistryAndStuff 
Conflicts:
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
 2015-03-28 19:14:59 +03:00
Zuhayr
0c3a18b0b6 Merge pull request #8380 from volas/sanitize_procs 
[DNM] sanitize() and text.dm refactoring
 2015-03-29 00:57:33 +10:30
Zuhayr
c0887333bc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-03-27 11:13:53 +10:30
Zuhayr
efa6f0d3c9 Finalized monkey species definitions and icons. 2015-03-26 14:45:41 +10:30
Zuhayr
ba648e3e8d Updated ismonkey(), refactored kitchen spike, refactored plastic flaps. 2015-03-26 12:45:12 +10:30
Zuhayr
8af1a818e9 Merge branch 'monkeys' of https://github.com/Zuhayr/Baystation12 into monkeys 2015-03-26 12:18:14 +10:30
Kelenius
b4b635f32d Chemistry commit 
I messed something in the git
 2015-03-25 19:09:10 +03:00
volas
e3d41c3112 Merge remote-tracking branch 'upstream/dev' into sanitize_procs 2015-03-25 01:06:32 +03:00
Chinsky
959ee07119 Merge pull request #8607 from Kelenius/ofDrillsAndMiners 
Updates drill and scanner
 2015-03-24 20:05:25 +03:00
Zuhayr
d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
Kelenius
78bac425ad Updates drill and scanner 2015-03-24 18:34:26 +03:00
Zuhayr
0bb2cd835c Merge pull request #8600 from mwerezak/bread-tube 
Adds bread tube trash item, merc shuttle vendor
 2015-03-25 00:54:16 +10:30
PsiOmegaDelta
89965420bb Merge pull request #8603 from Baystation12/dev-freeze 
Dev freeze
 2015-03-24 14:00:57 +01:00
mwerezak
1ce81b91b1 Adds bread tube trash item 2015-03-24 04:03:06 -04:00
Zuhayr
45f28d5372 Fixes #8485 2015-03-24 13:20:24 +10:30
PsiOmega
2a17d656f2 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-23 11:47:15 +01:00
volas
f8822626bb sanitize() refactor: second pass(other sanitize functions) 2015-03-23 01:38:09 +03:00
volas
855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
Zuhayr
bf8ad6d585 Rebalanced xenoflora sprites, fixed numerous issues. 2015-03-22 16:13:15 +10:30
Zuhayr
a8f44cae98 Resolving bugs with spawn order and delays. 2015-03-21 11:49:42 +10:30
Zuhayr
2c269e5159 More work on Heist. Remapped the Vox shuttle and added a base for it. Tweaked spawn values etc. 2015-03-21 11:13:48 +10:30
Zuhayr
8d698f0c06 First pass on making heist a pirate mode (human based) 2015-03-21 11:13:05 +10:30
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
PsiOmega
7ab57a4917 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm
 2015-03-20 08:44:52 +01:00
PsiOmega
6e2488ccb0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/stool_bed_chair_nest/chairs.dm
 2015-03-20 08:26:34 +01:00
PsiOmega
3d9d05afce Fixes #8107. 
The announcer again has its given name, rather than a randomly selected one.
The announcer now states its business, rather than talks about it.
The announcer now uses the proper frequency.
 2015-03-19 21:33:58 +01:00
Chinsky
be8e76a01e Merge pull request #8535 from Kelenius/ofCandlesAndTime 
Makes candles last longer
 2015-03-19 00:20:07 +03:00
Kelenius
cc9f15dd67 Makes candles last longer 2015-03-18 20:57:51 +03:00
Mandurrrh
618249131e Gives more/better comfychair color options. Removes unused icons from objects.dmi. 2015-03-18 00:26:42 -04:00
Zuhayr
961272817f Merge pull request #8461 from comma/biofluff 
Added support for multiple cloning vats per single console.
 2015-03-18 02:55:05 +10:30
Chinsky
d2518798ec Merge pull request #8486 from PsiOmegaDelta/NanoLaws 
NanoUI - Silicon law manager
 2015-03-17 14:24:30 +03:00
Zuhayr
e600cdbd3b Fixes #8430 2015-03-17 19:18:30 +10:30
Chinsky
158a2731e3 Merge pull request #8335 from GinjaNinja32/reagent_dispenser 
Reagent dispenser rework
 2015-03-17 10:05:18 +03:00
PsiOmega
7f68403ae4 NanoUI - Silicon law manager 
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
 2015-03-17 07:22:02 +01:00
GinjaNinja32
458970a617 Merge remote-tracking branch 'upstream/dev' into reagent_dispenser 2015-03-16 21:21:56 +00:00
Techhead0
2ca80a06b9 Botany tool construction and clippers 
Adds hatchets and mini hoes to the autolathe recipe list. Material costs
are unchanged. Also adds plant clippers (reskinned wirecutters) to
secure hydroponics lockers.
 2015-03-15 19:15:35 -04:00
Techhead0
020e1e4c60 Tweaks. 
Regeneralizes sunglasses. Adds plant analyzer and megaphone. Puts EMT gear under general medical.
 2015-03-14 15:52:29 -04:00
Techhead0
d4e46182af More things in belts. 
I widened the selection of things you can put in various belts. Most
notably, emergency gear in medical belts and botany gear in tool belts.
 2015-03-14 14:38:30 -04:00
Chinsky
ba18611bb3 Added support for multiple cloning vats per single console. 
On spawn, console will attempt to connect to all unconnected cloning vats.
You can change what console connects to which pod with multitool.
 2015-03-13 13:21:19 +03:00
PsiOmega
ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm
 2015-03-13 09:23:26 +01:00
PsiOmega
533ccef0ab Robot code clean up and fixes. 
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
 2015-03-10 13:37:20 +01:00
Zuhayr
00976aea43 Merge pull request #8417 from PsiOmegaDelta/SolidMatter 
Attemps to fix #8390 + solid bonus
 2015-03-10 09:29:04 +10:30
Zuhayr
fc985c2a27 Merge pull request #8416 from PsiOmegaDelta/Ninjas 
Fixes ninja spawn logic.
 2015-03-10 09:27:11 +10:30
PsiOmegaDelta
668c4baee7 Merge pull request #8382 from comma/monkey_revenge 
Allows you to scoop monkeys up
 2015-03-09 21:17:03 +01:00
PsiOmega
baed39c263 Attempts to fix persistent station alarms. Makes wardrobes solid. 2015-03-09 20:55:05 +01:00
mwerezak
b9d2517d83 Tweaks random gun spawners and supply packs 
laser carbines and laser pistols spawn in the armoury with equal
probability.
Stunshells are now rare like they should be.
Shotgun crates now have two combat shotguns, as they are less likely to
spawn in the armoury anyways.
Weapons crate comes with laser pistols, energy weapons crate comes with
laser carbines. Seemed more consistent that way.
 2015-03-09 15:47:25 -04:00
PsiOmega
57c0591283 Fixes ninja spawn logic. 
Fixes the logic I re-made after a PR comment without double-checking it.
Changes ninjastart to use the actual landmarks instead of locs for consistency.
 2015-03-09 19:22:07 +01:00
Chinsky
d8c2a36f9f Merge pull request #8387 from PsiOmegaDelta/ChangeAppearance 
Mirror and ERT appearance improvement.
 2015-03-09 13:42:19 +03:00
mwerezak
b71f6c1121 Partial breathing refactor 
Reorganizes breathing, and moves common human/monkey breathing code into
carbon. handle_breath() is largely unchanged.
Removes unnecessary handle_internal_lifeform().
Fixes monkies being held by people in mecha in space not being able to breathe.
 2015-03-09 00:09:34 -04:00
PsiOmega
c6b0370b6a Mirror and ERT appearance improvement. 
NanoUI-based appearance changer, with flags to set exactly which parts of the appearance which can be changed.
 2015-03-07 23:11:00 +01:00