6fc19c7c23
Merge pull request #12385 from bgobandit/morexenobioshit
...
Adds bio-bags, primarily for xenobiologists.
2015-10-19 19:53:45 +03:00
3662a52eb1
Merge branch 'master' of https://github.com/tgstation/-tg-station into Armoury
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-10-19 02:16:24 +08:00
ca7a38eb59
halves storage capacity
2015-10-15 00:43:38 -04:00
9aae866651
le fluff faec
2015-10-14 10:17:14 -04:00
cee7614cb7
Adds bio-bags.
2015-10-13 23:06:35 -04:00
ac57b4ee03
InitalCommit
2015-10-12 11:59:33 +08:00
9c3d5ae3c7
Fixes runtimes with augmented_eyesight refund, atom/movable/Bump(), fleshmend, spraycans, PDA messaging, remove_from_storage(), and gun burstfiring.
2015-10-11 17:18:31 +02:00
effae76516
Merge branch 'bundlestuff' of https://github.com/bgobandit/-tg-station into bgobandit-bundlestuff
2015-10-10 02:04:43 +03:00
38f5c0c85a
Merge pull request #12122 from Steelpoint/Magazine
...
[MAP] Continuation Of Armoury Map PR + Magazine Removal
2015-10-07 15:13:15 +02:00
653e5d18f3
Merge pull request #12027 from Fox-McCloud/advancedmop
...
Re-Adds Advanced Mop, Adds in Bluespace Trashbag, and Suds up the Janitor
2015-10-04 05:13:48 +03:00
b5ded1c9e8
InitalCommit
2015-10-03 21:22:29 +08:00
8e82cf324a
Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit
...
Conflicts:
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-10-02 00:41:19 -04:00
26b8112dea
Adds additional items to the storage of many coats and oversuits.
2015-09-29 22:29:07 -04:00
960f0b3129
adds in bluespace trashbag
2015-09-26 18:07:16 -04:00
e1b16b057c
Merge pull request #11964 from Delimusca/durrymunchin
...
ease-of-use smoking improvements
2015-09-24 22:26:22 -05:00
e971423dc6
removed targetzone checks from smoking stuff
2015-09-23 15:16:11 -06:00
4d4b8e64c1
Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-16 23:14:14 +01:00
1178fbe079
Major cult changes
...
The current code for runes is god-awful. Like, seriously terrible. This PR aims to fix that. Rather than having every rune effect defined in a single attack_hand proc, this PR will separate the runes into subtypes, which supports for more modular runes as well as cleans up the code.
It also separates invocation into a two different procs. The first of these will determine if the rune can be invoked; if that passes, the second will cause the rune's effects. There is also a third proc that will cause effects if the rune fails to invoke.
Research words have been removed, and all runes are now available from the start of the round. This is highly subject to change once some feedback is in from actual cult rounds.
Miscellaneous tweaks:
Blood boil runes now explode when used
Convert runes can now work solo, but take time
Armor runes now only provide the basic armor set
Tomes now do a static 15 burn damage and play a sound
If the Escape objective is rolled, the amount of people that must escape will scale with the round population to a factor of 5 (i.e. 50 players = 10 cultists)
2015-09-16 10:04:49 +12:00
c52c4a5346
Merge remote-tracking branch 'tgstation/master' into point-zero
...
Conflicts:
code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
f524f5b7e5
Balances syndicate bundles. BOY OH BOY OH BOY
2015-09-10 00:46:50 -04:00
b3b9941432
Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa
...
Conflicts:
code/modules/assembly/flash.dm
2015-09-09 14:04:41 -04:00
51934abbc8
Reworked nuke deconstruction. New nuke sprites. More++
...
Changelog
2015-09-06 21:35:14 +01:00
93b9f96cfa
Merge pull request #11341 from bgobandit/suicideisnotajoke
...
Adds/tweaks several suicide messages.
2015-09-06 06:42:00 +03:00
df7386a4ec
Assemblies update
2015-09-04 11:22:37 +03:00
d23f2cb622
mats for toolboxes, glasses and flashes; adjusts coin amounts up slightly
2015-08-31 12:14:34 -04:00
51c09f16bf
makes all Destroy()'s return properly
2015-08-31 00:21:01 -06:00
020ea5d262
Adds materials to some items for recycling purposes.
2015-08-30 14:28:56 -04:00
7f0f74f100
Merge pull request #11380 from bgobandit/salicyclicassblastusa
...
Fixes burn kits containing salicyclic acid pills. Adds new burn medication.
2015-08-27 23:53:58 -05:00
6ab2443255
Adds oxandrolone, a new burn medication designed to work upon ingestion. Adds oxandrolone to burn kits. Adds changelog.
2015-08-25 13:46:05 -04:00
132adf3f00
adds silver sulf syringes instead of kelotane pills
2015-08-24 21:45:18 -04:00
ce8722b868
Fixes burn kits containing salicyclic acid pills.
2015-08-24 21:36:50 -04:00
4909600303
Adds/tweaks several suicide messages.
2015-08-23 15:02:34 -04:00
dd6e735e71
The remove_from_storage() call from handle_atom_del() will stop dropping the objects on null, to avoid having other storage objects with items inside in a null location.
2015-08-21 07:14:56 -03:00
6f4c89c5ff
Fixes the nuclear disk from not spawning under really specific circumstances
2015-08-21 05:22:20 -03:00
825b5794c7
Merge pull request #11239 from Firecage/del2qdel
...
del() to qdel()
2015-08-19 11:50:24 +02:00
7453449531
Merge pull request #10975 from bustygoku/Backpacks-Slotstuff
...
Changes Backpack Slotcount to 21
2015-08-18 20:14:16 +01:00
bf13763e3b
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel
2015-08-16 23:34:03 +02:00
dfae1e0b53
Changes a lot of del() to qdel()
2015-08-16 23:33:22 +02:00
df758d2fff
Merge pull request #11146 from MMMiracles/biomemes
...
Revamps Bioterror Darts
2015-08-15 22:47:00 +02:00
bf7dadc538
Merge pull request #11175 from Memendia/master
...
Grammar Fix
2015-08-14 12:25:57 +02:00
1142403f32
Merge pull request #11070 from PatchouliKnowledge/awkwardpoisons
...
Fixes syndie poison kits not being able to hold what they come with
2015-08-13 16:33:54 +02:00
6b649e583b
Grammar Fix
2015-08-12 21:09:39 -07:00
eedea4d281
Merge pull request #11018 from Core0verload/hammerspace
...
New traitor item: storage implant
2015-08-12 14:45:23 +01:00
35b78b1209
Revamps bioterror darts into a non-lethal syringe form. Removed the coniine and spore toxin to make it solely for quiet take-downs (in thoery).
2015-08-11 01:56:38 -04:00
9fb63dbec9
Fixes items that survive a storage container's destruction keeping the storage mouse_opacity
2015-08-07 23:02:28 +01:00
63c545346d
Merge pull request #10992 from RemieRichards/AlternateWornLayer
...
Adds alternate_worn_layer
2015-08-07 19:37:52 +10:00
d80ecd8c74
Fixes syndie poison kits not being able to hold what they come with
2015-08-07 02:44:46 +03:00
c2e9592009
Added Changelog And Fixed Smuggler Satchel And Duffelbag
2015-08-05 13:10:57 -07:00
4e5be438cd
Merge pull request #10990 from RemieRichards/StorageUnequipUsability
...
Storage Item Click Usability Improvement
2015-08-05 00:07:01 +02:00
Razharas