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
GinjaNinja32
f950ded9af
Merge pull request #10737 from PsiOmegaDelta/150818-RealFunny
...
Another Hurt/Harm fix.
2015-08-18 18:52:09 +01:00
GinjaNinja32
9f05c50a7c
Merge pull request #10732 from mwerezak/skipjack3
...
Fixes #10723
2015-08-18 18:51:37 +01:00
GinjaNinja32
1957029890
HUD cleanup, human/monkey HUD now turns correctly with client.dir
2015-08-18 18:21:25 +01:00
PsiOmega
0d10d53b65
Another Hurt/Harm fix.
...
Apparently clicking the intents directly or cycling through them updates the icons differently. Nice.
2015-08-18 18:41:24 +02:00
PsiOmega
e92e819bd9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-18 18:29:01 +02:00
PsiOmega
75c7313c46
On merge changes and map conflict fixes.
2015-08-18 18:19:51 +02:00
PsiOmega
8138815dc3
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-18 18:05:16 +02:00
GinjaNinja32
912f689e51
Diagonal, ctrl+dir, and alt+dir actions are now consistent with client.dir
2015-08-18 16:05:37 +01:00
GinjaNinja32
111400505d
Conveyors, signs, door buttons and crematoriums will now rotate correctly with client.dir
2015-08-18 15:48:55 +01:00
mwerezak
b361f9ad12
Fixes #10723
2015-08-18 10:28:06 -04:00
GinjaNinja32
2d5e221906
Sleepers, body scanners, intercoms, sinks, stools and fire extinguisher cabinets will now rotate correctly with client.dir
2015-08-18 14:51:59 +01:00
