Commit Graph

20433 Commits

Author SHA1 Message Date
Woodrat
7a42e001f8 Woodrat Work v8.1 "Glasslock Edition"
- Air Alarm added to tool storage and security port maintenance
- Fire Alarm and General Radio added to port emergency shuttle hallway.
- Fire alarm, radios, fire extinguishers, and glasslocks added to the central ring.
- Art Storage now has a light switch
- Blocking walls added to unused airlocks at central. Turret control and more turrets added on central.
- Glasslocks added all the way down the cargo hallway and in cargo. Fire alarms added as well.
- Fore Escape Pod hallway glasslocked and camera'd
- Phoron sheets for engineering generator readded to the crate in hard storage.
- Solar array on the engineering outpost now has a area, more outside lights.
- Cameras installed around the entire central ring.
- Civilian sector and library fully glasslocked.
- Handlabeler and newscaster added to visitor's lobby.
- Downgraded the amount of water used by fire extinguishers from eight to two.
- Changes made to make fire extinguishers useless against slimes half fixed.
- Added fuzzy cuffs
- Rigsuit knives now a option.
- Cameras added all the way through the civilian area hallways.
- AI pet called Steve.
2015-08-20 16:55:56 -07:00
Mark9013100
30babe48c3 Adds medical scrubs to custom loadout 2015-08-20 19:34:35 -04:00
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
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
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
1b64487f8d More computer overlay changes.
Fixes #10764 and a couple other computers.
2015-08-20 08:38:43 +02: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
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