cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-08 23:29:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,682 Commits 8 Branches 26 Tags
65151ade35d04cb3e4da503e952330bb4e723c92
Commit Graph

1660 Commits

Author SHA1 Message Date
GinjaNinja32
76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables 
Conflicts:
	code/setup.dm
 2015-05-16 08:53:33 +01:00
Zuhayr
5b9eefdebf Merge with dev. 2015-05-15 23:22:48 +09:30
Zuhayr
1e1471a601 Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173. 2015-05-15 23:19:57 +09:30
Zuhayr
624ffcff4c Fixes #9239 2015-05-15 18:40:32 +09:30
Kelenius
10915eae24 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
 2015-05-15 11:28:05 +03:00
GinjaNinja32
354859b889 Generalises shards, makes tables possibly create shards when falling apart, make tablesmash potentially give someone a faceful of broken glass if the table breaks 2015-05-15 04:47:18 +01:00
GinjaNinja32
21394e78c4 Merge remote-tracking branch 'upstream/dev' into new_tables 2015-05-15 00:12:40 +01:00
Chinsky
8d83e8d452 Merge pull request #9202 from Zuhayr/customitems 
Custom items refactor.
 2015-05-14 21:47:04 +03:00
GinjaNinja32
4b87799072 New tables, code section. Changelog entry soon. 2015-05-13 19:08:39 +01:00
Techhead0
93767c589e Adds beanbag shells to bar backroom. 
Also, fixes.
 2015-05-13 03:30:07 -04:00
Techhead0
f41300bbe3 Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox 
Conflicts:
	maps/exodus-1.dmm
 2015-05-13 03:10:36 -04:00
Techhead0
e38ef1c7ef Moves survival boxes to species datums. 
Surivival gear is now assigned based on species. Most
species get standard gear, but Vox receive a nitrogen
tank instead, and Diona obtain an emergency flare
instead of a survival box.
As a side effect, engineers no longer spawn with larger
emergency tanks.
Fixes #9237
 2015-05-13 02:31:17 -04:00
Zuhayr
4e85c5f387 Dev merge. 2015-05-12 23:33:29 +09:30
Zuhayr
9896bb4a9c Cleanup of custom item icons. 2015-05-12 23:21:23 +09:30
Zuhayr
49930fe55d Debugging! 2015-05-12 21:30:06 +09:30
Chinsky
e9cc39039c Merge pull request #8946 from Zuhayr/miningstuff 
Wall refactor/mining changes.
 2015-05-12 13:13:31 +03:00
Zuhayr
b15ff78302 Merge pull request #9130 from mwerezak/device-powercell 
Adjusts charge cost for energy type guns
 2015-05-12 18:11:39 +09:30
Zuhayr
084b2f7825 Merge pull request #9220 from comma/pruttyshiny 
Useless lights galore
 2015-05-12 17:30:38 +09:30
Chinsky
3b3f23e502 Useless lights galore, adding small/colorful lights: 
Lamps (old-looking ones), flares now have different color from usual flashlight.
Lit cigs give 0.25 power light - just enough to stand out in full darkness.
Candles are colored too.
Different colors for different camera consoles instead of SUPER RED for everyone.
 2015-05-12 10:23:24 +03:00
Zuhayr
c06323ef7a Merge pull request #9199 from Techhead0/voidmachine-englishlists 
Changes machine frames and voidsuits to use proc/english_list() and removes frame_desc
 2015-05-12 14:20:37 +09:30
Techhead0
0d9a482be8 Removes frame_desc from circuitboards. 2015-05-12 00:09:51 -04:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr
4cf296a6c9 First pass on custom item cleanup/refactor. 2015-05-12 10:53:16 +09:30
Zuhayr
e28acd5045 Dev merge. 2015-05-11 18:45:14 +09:30
PsiOmega
d14904e1d6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm
 2015-05-11 09:28:59 +02:00
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Mloc
16d50c645d new object-based lighting system 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:25 +01:00
PsiOmega
9d883ea914 Corrects implanter attack log. 
The contents of the implant was reported in the attacker/victim log but not the admin log.
 2015-05-10 15:11:37 +02:00
PsiOmega
b98461c2af Station alarm monitor changes. 
Replaces a couple of station alarm monitors with variants that display all alerts; fire, atmospherics, power, camera and motion rather than just the first 3.
Adds a basic station alarm monitor on the engineering outpost.
 2015-05-08 11:22:29 +02:00
PsiOmega
10edb06036 Do not copy-paste code. 
Do not copy-paste code.
 2015-05-07 08:43:24 +02:00
PsiOmega
9e4dacc765 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/machinery/machinery.dm
	code/game/objects/items/weapons/storage/misc.dm
	code/game/response_team.dm
	html/changelogs/HarpyEagle-NeckgrabFix.yml
 2015-05-07 08:14:57 +02:00
mwerezak
3e1e137cec Adds device powercells 
Adds a type of smaller power cell for powering devices. Not used by much
at the moment, but it's one step closer to a more coherent picture of
power cells.
 2015-05-06 23:41:57 -04:00
Chinsky
d1b4289b74 Merge pull request #9118 from PsiOmegaDelta/HaltSecurity 
Fixes #9065.
 2015-05-06 17:25:11 +03:00
PsiOmega
4af458ef6c Fixes #9065. 
Central Command ids now at least makes security equipment respect you.
 2015-05-06 15:23:44 +02:00
PsiOmega
767c6a151b Fixes #9107. 
The empty donut box no longer uses a non-existing item state.
 2015-05-06 15:06:19 +02:00
PsiOmega
1c38be5cfd Crayons are now children of pens. 2015-05-05 08:41:24 +02:00
Kelenius
873b38e0a5 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
 2015-05-04 22:36:35 +03:00
PsiOmega
ca7fa2aa19 Grilles and rods. 
Grilles no longer return more rods than they were created from when destroyed (by method other than wirecutters).
Rods are now acquired from and returned to a pool.
Also adds a pre-broken grille for mapping, avoids the case where one might be able to destroy the same grille twice.
 2015-05-02 21:35:02 +02:00
PsiOmega
904efa322f Breaks up the remote door control button into subtypes, depending on what is remotely controlled. 
Also ensures that the door button respects cut wires, etc.
 2015-04-30 18:26:31 +02:00
Kelenius
a2cea5c49c Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
 2015-04-28 19:22:35 +03:00
Kelenius
317abc6b79 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
 2015-04-28 10:49:26 +03:00
PsiOmega
86d2fa5f61 Build fixes. 2015-04-28 09:04:00 +02:00
PsiOmega
f760d44127 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm
 2015-04-28 08:43:31 +02:00
PsiOmegaDelta
1e457f6e34 Merge pull request #9009 from Yoshax/icanintosurgery 
Fixes antag surgery kit
 2015-04-28 07:35:58 +02:00
Chinsky
1328414485 Merge pull request #8960 from mwerezak/item-color 
Fixes #8577, cleans up item_color, clothing/under and backpacks
 2015-04-28 06:25:35 +03:00
Yoshax
aa115f5bb2 Fixes antag surgery kit 2015-04-27 16:41:47 +01:00
RavingManiac
89a72fb326 Candle burn time increased to ~30 minutes 
Some fluff added to candle description explaining how they burn in space
 2015-04-27 12:10:54 +10:00
Zuhayr
1c627a94b9 Merge pull request #8991 from Kelenius/ofBotsAndMobs 
Updates bots to be mobs. Several changes.
 2015-04-27 11:29:32 +09:30
mwerezak
549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-04-26 14:53:01 -04:00
Chinsky
e0c00bda55 Merge pull request #8973 from mwerezak/inventory2 
Inventory updates
 2015-04-26 20:13:21 +03:00