c81ad0964e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-08-15 11:06:03 +02:00
3a08e2884a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/largecrate.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
c455cef9a5
More frag grenade tweaks
...
Finalizes frag grenade values, fragments no longer produce admin logs, and comments out debugging code.
2015-08-15 03:19:47 -04:00
8b08f8ff34
Fixes explosions deleting projectiles
2015-08-15 02:51:02 -04:00
4092b40ae5
Updates frag grenades to use bresenham, tweaks
2015-08-15 02:41:32 -04:00
5f5671d21f
Merge pull request #10647 from mwerezak/acids
...
Fixes #10645
2015-08-14 22:22:41 -07:00
133bc96344
Fixes #10645
...
Sets unacidable where appropriate.
2015-08-14 23:20:10 -04:00
54616641bf
Upgraded Syndicate id.
2015-08-14 17:31:58 +02:00
d34599db55
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into russian_roulette
...
Conflicts:
code/game/objects/items/devices/uplink_items.dm
2015-08-14 18:24:47 +03:00
36d0eb0bcf
Cleans up id card setup. Now with less automagic and more controlled.
2015-08-14 16:08:47 +02:00
bc73de33b8
Id cards are now cool when examined.
2015-08-14 15:40:39 +02:00
0380d5d9d4
Completes the feature where mercenaries can setup fake crew announcements and records.
2015-08-14 13:42:11 +02:00
02b6021277
Compilation fixes.
...
It's apparently 10mm now.
2015-08-14 08:51:06 +02:00
d5c6d9c341
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-14 08:43:43 +02:00
3a55b130a0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
.travis.yml
code/modules/virus2/disease2.dm
maps/exodus-5.dmm
2015-08-14 08:34:42 +02:00
da58494275
Improves the way shrapnel clouds hit prone mobs
2015-08-14 00:25:41 -04:00
b01a41d766
Merge branch 'capgun' into russian_roulette
2015-08-14 06:03:33 +03:00
f5a59ecc9b
Compile fix
2015-08-14 06:00:22 +03:00
328621b860
Moved cap guns to proper guns.
2015-08-14 05:51:29 +03:00
76b6b90299
Adds armor_penetration values to energy weapons
2015-08-13 22:38:53 -04:00
701515ae88
Merge pull request #10202 from mwerezak/20150713-molotov-cocktail
...
Rag and drink bottle improvements
2015-08-14 03:55:35 +03:00
c664ca6096
Merge pull request #10276 from mwerezak/uplink-items
...
Allows traitors the option of purchasing the C-20r or STS-35
2015-08-14 03:55:03 +03:00
c5d54ba454
Merge pull request #10455 from mwerezak/t-scanner
...
Adds client image based t-scanner
2015-08-14 01:39:36 +03:00
b5425e0bd9
Makes beer and ale bottles into actual bottles, adjusts bottle smashing
...
Generalizes opening drink containers, makes beer and ale bottles a subtype of bottle instead of can
Adjusts bottle smashing, duration, damage, and reliability.
2015-08-13 18:37:13 -04:00
d1e8f670b2
qdel(reagent) adjustments.
...
Attempts to ensure qdel(reagents) only occur once per Destroy()
2015-08-13 10:26:31 +02:00
59d0e28aff
Allowed pAIs and AIs loaded into hardsuits to move and rest when control is enabled or the user is unconcious/dead.
...
Allows AIs/pAIs in rigs to use the selected module via middle click.
2015-08-13 17:09:22 +09:30
231eaf7e76
Added antag uplink option for hacked supply pod.
2015-08-13 16:59:18 +09:30
efef67a3e4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-13 09:11:05 +02:00
1b10f78940
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-08-13 09:01:10 +02:00
db565ae2ff
Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery
...
Conflicts:
code/datums/datacore.dm
code/defines/obj.dm
2015-08-13 08:11:32 +02:00
77d0bbd643
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/gamemodes/changeling/modularchangling.dm
2015-08-13 08:09:28 +02:00
df92e8d1d1
Woodrat Work 7.9 - Minty Fresh Edition
...
- EMP box sprite added and now used for the EMP box.
- Adjusted lights in Janitorial
- 5 Earmuffs added to Engineering. 3 to atmos, 2 in the engine monitoring room.
- Dock Port broken wire fixed and pipes removed.
- Misplaced CMD camera near the park deleted.
- Fixed EVA maint door access.
- Due to popular request, laser tag lockers now have 5 sets of equipment rather than two.
- Fixed some holodeck designs
- Slimes added to xenobio
- Random gas sensors in space near the research outpost fixed.
- CE door access fixed.
- Changed Northern Star issue tag to mint green.
- Mining z-level overhaul, mining engineering outpost given its own area. Standardized wire colors, overhauled engineering outpost on the mining z-level, added substations to each outpost.
- Empty jar added to the RD office
- Beepsky removed until I can figure out how he beeps.
- AI and status displays added to the pool.
- Random shovel now in science/cargo maintenance.
- Fire alarms and other equipment added to the coffee shop.
- Fire alarm, radio, fire extinguisher, light switches, shutters, and a button added to the IA office.
- Furniture changes to the metal chair and comfy chair.
2015-08-12 21:47:49 -07:00
6781e05bd6
Merge pull request #10086 from mwerezak/arrows
...
Adds the ability to draw arrows with crayon
2015-08-13 07:24:03 +03:00
3fd8627bd7
Merge pull request #9996 from PsiOmegaDelta/150702-AtmosAnalyzeCleanup
...
Refactors gas analyzation.
2015-08-13 07:23:10 +03:00
792d6e2864
Merge pull request #10579 from mwerezak/misc
...
Fixes
2015-08-12 22:21:34 +01:00
19fbc71249
Removes req_amount from stack_recipe_list
...
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572 .
2015-08-12 15:54:16 -04:00
ba240cb768
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/atmoalter/portable_atmospherics.dm
code/game/machinery/spaceheater.dm
code/modules/clothing/head/soft_caps.dm
maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
012fb38de2
Finalizes mechfab
2015-08-12 21:46:11 +03:00
0e52b3d4df
Merge pull request #10562 from PsiOmegaDelta/150812-OneCrew
...
Fixes the One Crew Member module.
2015-08-12 20:38:52 +03:00
a62edc5b3a
Fixes #10548
2015-08-12 12:21:28 -04:00
249db0b03d
Fixes the One Crew Member module.
...
Didn't return properly in install().
Override transmitInstructions() when addAdditionalLaws() was more than sufficient.
2015-08-12 14:42:52 +02:00
e4f6436a85
Fixes #10494 .
...
Borgs have their very own custom little headset, so cute.
2015-08-11 21:11:16 +02:00
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
7b1656f40c
Merge pull request #10470 from Karolis2011/dev-freeze
...
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
2015-08-11 20:07:06 +03:00
8c0984d5b1
Fix gender issues, some typos from various files
2015-08-11 13:41:40 +03:00
1324e69a19
Fixes #10466 - chem implant can't be loaded
...
What the literal shit.
2015-08-11 10:26:22 +03:00
cb2a094553
Adds fragmentation grenades
...
Adds a fragmentation grenade item that launches a shower of projectiles
in all directions when detonated.
2015-08-11 02:42:25 -04:00
7562f6f01a
Updates mechfab interface
...
Fixes all bugs I found.
2015-08-10 17:46:03 +03:00
65089c44b7
Adds a box for fingerprint cards
2015-08-09 11:36:57 -04:00
b8c0c5ca5d
Woodrat Work 7.8 "Tiny mini skirt edition"
...
- Added jumpskirts to their department lockers.
- Fixed minor code issue with the QM skirt
- Single scientist wardrobe added to research rest room
- Removed robust cola machine from gateway, added laptop vendor in its stead.
- Two universal recorders added to the main map. Captain's office and art storage.
- Adjusted and added cameras to the doc area to improve coverage.
- Adjusted cameras in primary hallway leading to the dock for coverage purposes.
- Added newscaster to central park.
- Finalized work on the large dorms/visitor housing.
- Added CM sprite for frag grenades for our grenades, also lessened the size of the explosion to (-1,-1,3) from (-1, -1, 4) in a vain attempt to make the blast radius smaller. They shouldn't be too much weaker but...
- Sprite for a box of frag grenades added, box of 7 frag grenades also added to code.
- Two merc op TTVs removed, one left behind. One box of frags and 6 blocks of c4 added to merc op shuttle in their stead.
- One box of frag grenades added to ERT armory.
2015-08-08 23:18:39 -07:00
PsiOmega