cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 11:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,530 Commits 8 Branches 26 Tags
eef2f589cefe16332382bc30939c1dfd99dbabfe
Commit Graph

2562 Commits

Author SHA1 Message Date
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
PsiOmegaDelta
57b5d43b4e Merge pull request #9218 from Zuhayr/hailers 
Allows hailer messages to be altered.
 2015-05-12 15:00:36 +02:00
Zuhayr
49930fe55d Debugging! 2015-05-12 21:30:06 +09:30
Zuhayr
2222445eb3 Merge pull request #9166 from MrSnapwalk/AI-and-pAI-sprites 
Adds 7 new AI core sprites and adds new pAI card sprites.
 2015-05-12 21:01:30 +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
27f03d557f Allows hailer messages to be altered. 2015-05-12 16:42:43 +09:30
Zuhayr
f76a1d2024 Removed custom item defines, refactored mech kits. 2015-05-12 15:49:56 +09:30
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
Mloc
e602a7e286 remove the sub-area system 
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 17:06:29 +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
MrSnapwalk
34eb2872b6 Makes the code compile by adding a comma and removing some unused lines. 2015-05-10 02:03:28 -05:00
MrSnapwalk
89aa07fdf9 Adds new pAI sprites by WalterJe, adds a few more emotions (neutral, silly, :^), smirk, exclamation points, and question mark). Adjusts Tudoreleuu's custom item sprite to fit the new screen sprites. 2015-05-10 00:40:13 -05: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
7cbd72d1be Cleanup. 2015-05-07 09:09:12 +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
e9b32cf26e Ensures drained_this_tick is actually set. 2015-05-06 12:30:05 +02:00
PsiOmega
72ffea6fd3 Attempts to ensure the powersink remains processed correctly, moves processing disconnection into Destroy(). 2015-05-06 12:25:50 +02:00
PsiOmega
78a9a43de6 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/controllers/master_controller.dm
	code/game/objects/items/devices/powersink.dm
 2015-05-06 12:19:50 +02:00
Atlantiscze
91e3ced65e Powersink Fix 
- Fixes powersinks lasting for infinite duration before exploding.
- Minor adjustment to powersink drain rates. Powersink now drains up to 1.5MW instead of  1MW. It also attempts to drain up to 5kW instead of 2kW from each APC, unless powernet supplies enough power. They can still be overpowered by pumping more than 1.5MW into the grid, which is possible if you either install more coils into main SMES, or use the solars. Even 1MW of default SMES is enough to slow the drain effect considerably, espicially if you can isolate it with breakers.
- Fixes "APC Flickering" issues caused by powersinks. Powersinks are now processed immediately after powernets, which ensures they are first to take power from that powernet. This is unfortunately necessary as APCs would take power first, which is not desired.
- Minor refactor while i was at it - absolute paths, span classes, visible_message() instead of for cycle. No gameplay effect.
 2015-05-05 18:49:11 +02:00
PsiOmega
1c38be5cfd Crayons are now children of pens. 2015-05-05 08:41:24 +02: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
Chinsky
a9b1f8bfe0 Merge pull request #9042 from PsiOmegaDelta/Buttons 
Small remote button refactor.
 2015-05-02 19:50:24 +03:00
Chinsky
3d7bfd8aff Merge pull request #9007 from PsiOmegaDelta/Initialize 
Removes the need for spawn() in New() procs.
 2015-04-30 21:12:06 +03:00
PsiOmega
fcfdcecd3a initialize() should now always be called, be it on game starting up or object being created after game start. 
Partially fixes #9036.
 2015-04-30 19:28:35 +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
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