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
17,778 Commits 9 Branches 26 Tags
cf53a4d6fb02caef6f157ec78cedb0076640dd40
Commit Graph

1235 Commits

Author SHA1 Message Date
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
Zuhayr
3b3bd5649d Merge pull request #5024 from Jarcolr/Cargo 
Adds 21 new crates and a tweak
 2014-05-28 01:21:24 +09:30
Jarcolr
049b9cc447 Fixes and a suggested change 
Fixed N2O typo, Super Pacman, anchor issues, inflatable barrier issues
that was already on master so this doesn't conflict, and added a new box
for shotgun shells and adjusted price of crates accordingly
 2014-05-27 17:15:17 +03:00
Ccomp5950
ff0d667337 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2014-05-24 19:02:16 -05:00
mwerezak
c4e811829e Fixes #5043 2014-05-22 18:47:38 -04:00
Mloc-Argent
e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
 2014-05-14 22:42:03 +01:00
Ccomp5950
bc21d1734c Merge pull request #4962 from mwerezak/internal-storage-ground-fix 
Internal storage fix
 2014-05-12 11:41:48 -05:00
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
 2014-05-11 13:19:09 +00:00
Loganbacca
f32d281132 Compressed matter implanter fix 
Compressed matter implanters will now correctly remove the compressed item from the game world if it is in an inventory (player or storage container).
 2014-05-11 18:30:18 +12:00
Mike
cee43ffbf3 Fixes internal storage on ground 
Fixes not being able to remove items from internal storage when the
master item is on the ground.
 2014-05-10 23:41:48 -04:00
Zuhayr
1fc3ecf145 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 2014-05-10 01:40:11 +09:30
Zuhayr
9f2f5fb488 Fixes #4808 2014-05-10 00:30:03 +09:30
Mloc-Argent
a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00
Zuhayr
a1f6b7a211 Merge pull request #4885 from mwerezak/equipment-fixes 
Misc Equipment fixes - Mostly hardsuits
 2014-05-07 09:59:44 +09:30
Mloc-Argent
6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Jarcolr
5bc9ea47e4 Added storage/misc for objs that don't fit in 
Also moved the dicepack there.
 2014-05-04 00:40:08 +03:00
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 16:56:19 +01:00
Zuhayr
0e39f18763 Compile fix. 2014-05-03 23:17:08 +09:30
Zuhayr
5b32150858 Fixes for previous commit, sigh. 2014-05-03 21:21:19 +09:30
Zuhayr
25c85d6e2a Adding some repair procs to cables and welders for IPC use. 2014-05-03 21:10:26 +09:30
Mike
946fd5329f Fixed null flag for cigarette type 2014-05-02 15:59:47 -04:00
Mike
ba0dded672 Holsters and Unathi knife harness 
Also fixed mistyped path and OnClick bug.
 2014-04-29 22:43:10 -04:00
Mike
ae49ba210b Webbings now use internal storage 
Clothing no longer manipulates webbing members for better encapsulation.
Instead attackby() and attack_hand() are forwarded to accessories if
they are present.
Removed "Look in Storage" verb for less verb clutter.
 2014-04-29 20:34:01 -04:00
Mike
172bda548e Fixed internal storage, added coat pockets 
/mob/proc/ClickOn() now checks storage levels, not just contents levels,
now allows items to be taken out of internal storage attached to another
item.
Coats now use internal storage for their pocket slots, removed duplicate
storage code.
Moved coat.dm out of it's special folder and into modules/clothing.
 2014-04-29 19:00:36 -04:00
Mike
51f8bfe3ce Fixed accidentally omitted call to parent 2014-04-29 09:37:25 -07:00
Mike
591df34c86 Removed broken backpack unequipping sound 2014-04-29 09:20:21 -07:00
Mike
5a797b8d03 Add internal storage type 2014-04-29 09:18:17 -07: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
Mloc
74ef3765d0 Merge pull request #4825 from DJSnapshot/hotfix 
IPC fixes
 2014-04-25 21:32:45 +01:00
DJSnapshot
a6fbde8f2f Fixes for Mloc, part 2. 2014-04-25 13:31:10 -07:00
Ccomp5950
93b398b4e6 Some more fixes. 
Derp fix on objects, we check mob contents instead of src.contents for any objects that can hear and pass hear_talk on to it.
Tape recorder will record the verb sent instead of doing it's own thing with verbs.
 2014-04-25 02:02:45 -05:00
Mike
1bbb68e9d2 Backpacks now play sound when un/equipped 
They did this before, but that was due to all storage items playing
sound. Now only applies to backpacks.
 2014-04-24 21:18:46 -07:00
Mike
e84747510c Cleaned up reference to outdated proc 
Removed references to outdated get_equipped_items(). Still one left.
Removed unnecessary override for belts.
 2014-04-24 21:01:01 -07:00
Mike
886b3b1cae Storage sound is now controlled by var 
Realized the previously removed MouseDrop override for pill bottles was
to stop the rustle sound from playing.
 2014-04-24 20:28:50 -07:00
mwerezak
b2234cb774 Rustle sound now plays any time a storage is opened 2014-04-24 12:53:07 -04:00
mwerezak
82499cf50c Updated subtypes of storage to use the new open() proc 
Also got rid of /obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj). Not sure what it was doing differently.
 2014-04-24 12:51:23 -04:00
mwerezak
8109c33749 Removed hold.loc = usr hack from webbings code. 
Got rid of the stupid hold.loc = usr hack. Now not necessary, as storage is refactored so that there is now an explicit proc for when a mob opens up a storage to view the contents. Removed the inaccessible if statement in /obj/item/weapon/storage/MouseDrop() (bad automerge?)
 2014-04-24 12:24:00 -04:00
DJSnapshot
bd2b46078a fix for https://github.com/Baystation12/Baystation12/issues/4548 2014-04-20 21:57:23 -07:00
DJSnapshot
13237e315f Fix for https://github.com/Baystation12/Baystation12/issues/4512 2014-04-20 21:46:13 -07:00
Brian Cook
804e3f1a29 Update and clean up of all manuals 
- Fixed typos
- Fixed grammar/punctuation
- Corrected out-of-date details
- Formatted to match font type and size of rest of the game
 2014-04-20 16:09:57 -07:00