SinTwo
7da2caa470
Un'fixing' DB and restoring global.dm
...
Seriously no clue how to get this DB going any more...
2015-08-20 17:55:03 -04:00
SinTwo
26ad368b18
DB Fix #2
...
The pain of SQL
2015-08-20 17:55:03 -04:00
Atlantis
5811b6021e
Machinery controller now reports amounts of powernets and pipenets as well.
2015-08-20 23:06:52 +02:00
Atlantis
e30e461843
Corrects supermatter fluctuations v2
...
- Better implementation of #10714
- This fix corrects the issue by merging pipenet process to machinery process to ensure order of execution doesn't change randomly. This shouldn't have any performance effect as pipenet process doesn't have much work anyway (not to be confused with air process that runs ZAS, this one only called process() on each pipenet). Screenshot of profiler (pipenet process highlighted, idle server with one player, engine set up) http://i.imgur.com/ecCg6rS.png
- Unlike previous fix, this does not come with various game-affecting side effects, players shouldn't see a change (except for the fact that odd fluctuations introduced by devmerge disappear). Previous fix buffed engine output as side effect, and caused one TEG to generate considerably more than second TEG, which caused TEGs to begin sparking despite overall output being below 1MW.
2015-08-20 22:23:45 +02:00
Chinsky
317eaf4771
Merge pull request #10101 from mwerezak/shards
...
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
Chinsky
b2e9a7c2a6
Merge pull request #9942 from RavingManiac/dev
...
Sound environment revamp
2015-08-20 19:47:09 +03:00
Neerti
33c352d879
Merge pull request #161 from Neerti/8/15/2015_new_ling
...
New Changeling (Part 1)
2015-08-20 11:59:57 -04:00
DelZeta
3baa60465e
Removes duplicate hallucination code.
2015-08-20 08:44:32 -07:00
Neerti
ecaf6758df
Begins work on new ling.
2015-08-20 11:38:48 -04:00
PsiOmegaDelta
120ce3f20c
Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums
...
Conflicts:
code/modules/admin/topic.dm
2015-08-20 14:16:35 +02:00
PsiOmegaDelta
a0a09c04e4
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
2015-08-20 14:09:07 +02:00
PsiOmegaDelta
cd06409a1f
Makes it possible for syndicate borgs to copy access from other ids.
2015-08-20 13:49:53 +02:00
PsiOmegaDelta
c346b99371
Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess
...
Conflicts:
code/game/objects/items/weapons/cards_ids.dm
2015-08-20 12:42:51 +02:00
PsiOmegaDelta
c2e2252342
Synth access and icon update changes.
...
Refactors how synthetics set their modules. On login, if appearance selection was initiated but not finalized, the selection options popup again. Fixes a long-standing issue of borgs being able to look like the standard module by loging out.
Ensures the syndicate agent IDs and syndicate borgs will always have the same initial access permissions.
Removes now unnecessary syndicate snowflake code from NanoUI.
Synths now utilize actual ids.
2015-08-20 12:40:08 +02:00
Zuhayr
c8b6813426
Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
...
Uplink Items - Part III
2015-08-20 19:19:12 +09:30
Zuhayr
fd007cdea0
Merge pull request #10765 from PsiOmegaDelta/150820-ComputerOverlays
...
More computer overlay changes.
2015-08-20 19:18:13 +09:30
DelZeta
81ccf07d80
Halloss now decays naturally after hallucinations, to avoid edge cases with other sources.
2015-08-20 02:26:46 -07:00
GinjaNinja32
dc35b0e717
fix wonky diagonal inputs
2015-08-20 09:42:48 +01:00
DelZeta
c97b1d4ea4
Fixes permahallucinations.
2015-08-20 01:14:41 -07:00
PsiOmegaDelta
1c92c62399
Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess
2015-08-20 10:01:19 +02:00
PsiOmegaDelta
1b64487f8d
More computer overlay changes.
...
Fixes #10764 and a couple other computers.
2015-08-20 08:38:43 +02:00
mwerezak
efc3121f68
Fixes reinforcing girders through windows, unbalanced span
2015-08-19 20:41:24 -04:00
FrickenChris101
a4b3ab1ca5
Flashlight Icon toggle fix
...
Just added additional code to update_brightness call and initialize.. Wasn't properly reflecting light being on or off.
2015-08-19 20:17:59 -04:00
Ccomp5950
11eefbc4c9
Merge pull request #9856 from Hubblenaut/dev
...
Beret Resprites
2015-08-19 17:56:37 -04:00
PsiOmega
c43ce91a99
Merge remote-tracking branch 'upstream/dev' into 150819-MoreDecalsBecauseYouLoveThem
2015-08-19 18:25:41 +02:00
PsiOmegaDelta
7241b59a70
Merge remote-tracking branch 'upstream/dev' into 150819-MoreDecalsBecauseYouLoveThem
2015-08-19 10:52:04 +02:00
PsiOmegaDelta
f46fcfaf52
Adds more decals. Moving turfs now includes under/overlays.
2015-08-19 10:44:42 +02:00
GinjaNinja32
a9773207b2
Merge remote-tracking branch 'upstream/dev' into client_dir
2015-08-19 09:42:48 +01:00
GinjaNinja32
03166ab4e9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-19 07:17:03 +01:00
GinjaNinja32
894b559e29
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-19 07:04:40 +01:00
mwerezak
7f17505e48
Cleans up mob_grab.dm
...
Moves all of the grab abilities into their own proc instead of having them all dumped into /obj/item/weapon/grab/attack().
2015-08-18 22:02:01 -04:00
Neerti
ceb8807d28
Merge pull request #160 from Mark9013100/mercswatboots
...
Gives Mercenaries SWAT boots
2015-08-18 18:55:41 -04:00
Mark9013100
f27e43998d
Gives Mercenaries SWAT boots
2015-08-18 18:19:00 -04:00
SinTwo
6c3eaaa180
DB fix #1
2015-08-18 18:13:43 -04:00
SinTwo
9b51c352ae
AS-24 Fix #2 + ignore
...
Ignore hides database config for hopeful database fix(?)
2015-08-18 18:09:48 -04:00
mwerezak
5603884095
Removes #undefine
2015-08-18 17:20:39 -04:00
mwerezak
1cb4afd906
Removes CHARGELEVEL_DEFAULT
2015-08-18 17:20:38 -04:00
mwerezak
58bc7fbb40
Cleans up dynamic member lookup
2015-08-18 17:20:37 -04:00
mwerezak
fd8f6d9639
Removes MASK/HEADCOVERSMOUTH
...
Code that used to check this flag now checks body_parts_covered for FACE
instead. Added a FLEXIBLEMATERIAL item flag to continue to allow vox to
eat food without poisoning themselves.
2015-08-18 17:20:36 -04:00
mwerezak
d70f064b1b
Adjusts phoron exposure to use body_parts_covered
2015-08-18 17:18:25 -04:00
mwerezak
ac738f3db4
Moves flags values to item_flags var
...
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
2015-08-18 17:18:25 -04:00
mwerezak
2cb46e035c
Removes unused obj flags and fixes overlapping flags
...
Removes ONESIZEFITSALL and NOSHIELD, which were unused.
2015-08-18 17:08:41 -04:00
mwerezak
70b74518a1
Moves BLOCKHAIR flags to flags_inv
...
Moves BLOCKHAIR and BLOCKHEADHAIR flags to flags_inv
2015-08-18 17:06:50 -04:00
mwerezak
b80c01ffbe
Removes *COVERSEYES
...
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
2015-08-18 17:06:49 -04:00
mwerezak
d3a40f4269
Cleans up defines
...
Replaces bitflag values with hex literals. Some other miscellaneous
cleanup.
2015-08-18 17:05:26 -04:00
HarpyEagle
2947a062a8
Decouples shard stepping protection from siemens_coefficient
2015-08-18 17:02:46 -04:00
HarpyEagle
651c2c6ba6
Species spawn_flags
...
Moves some more species flags into a new spawn_flags var.
2015-08-18 17:02:45 -04:00
HarpyEagle
8a9caac7cc
Splits species flags
...
Splits several species flags off into a separate appearance_flags var, to avoid rollover.
2015-08-18 17:02:44 -04:00
HarpyEagle
c136bd47cc
Improves shard-stepping
2015-08-18 17:01:39 -04:00
mwerezak
0d9ef708d5
Merge pull request #9905 from GinjaNinja32/jumpskirt
...
Adds SilveryFerret's Robotics Jumpskirt as a general custom loadout item
2015-08-18 16:55:47 -04:00
