Commit Graph

178 Commits

Author SHA1 Message Date
PsiOmega
3fb34237ee Additional uplink items.
Adds the syndicate radio channel encryption key for 2TC.
Adds a trash bag to the Smooth operator (9mm+silencer) kit.
2015-02-13 13:22:12 +01:00
PsiOmega
d4ae710c0c Tweaks and corrections. 2015-02-12 21:11:38 +01:00
PsiOmega
f8c5cf8f83 Adds a kit with cigarette packs and zippo lighter.
Includes 2 packs of flash powder cigarettes, 2 packs of smoke creating cigarettes, 1 pack of mindbreaker cigarettes, and 1 pack of tricordrazine cigarettes.
2015-02-12 16:35:49 +01:00
PsiOmega
49b1280b13 Tries to add more helpful information when examining a spy bug from real up close. 2015-02-11 21:39:42 +01:00
PsiOmega
73bc5934d5 Replaces uplink Donk-pockets with Sin-Pockets.
Sin-Pockets can be self-heated using the future magic of producing heat by mixing chemicals.
Each heated pocket contains: Doctor's Delight - 5 units, Hyperzine - 5 units, Synaptizine - 1 unit.
Overconsumption is definitely possible by the careless.

Makes the concealed cane use non-del methods.
2015-02-11 09:55:50 +01:00
PsiOmega
3a6c4dacd6 Adds 9mm gun with silencer, 5TC, with the option to acquire additional ammo, 2TC. 2015-02-10 22:39:40 +01:00
PsiOmega
d0a59bcd03 Adds a health section in the uplink.
Box of donk-pockets for 1 TC.
Combat medical kit, containing bicardine, dermaline, dexalin plus, dylovene, tramadol, and spaceacillin, for 5 TC.
2015-02-10 21:29:29 +01:00
PsiOmega
02dc9e3008 Lightly boosts the clerical kit.
Adds destination tagger, wrapping paper, hand labeler, and the ability to select pen color.
2015-02-10 20:12:32 +01:00
PsiOmega
8ceaa8b5a1 Traitors can now order a spy kit
Traitors can now order a spy kit containing 3 camera+radio bugs + a monitor for 2 telecrystals.
2015-02-10 19:33:02 +01:00
Raptor1628
76f4001cc1 Paramedic Job Fixed
Adds Paramedic job as outlined on the forums. Reduces MD access to EVA,
adds some minor EMT clothing stuff, and fixes #8020 and the medgreen
armband while I was piddling around in sprites.
EMT alt title and indent fixed.

Now less broken.

![](http://i.imgur.com/vOSoJy0.png)
2015-02-08 17:23:02 -05:00
mwerezak
5494b4d8c9 Supply packs, autolathe recipes, magazine and box definitions. 2015-02-06 20:16:35 -05:00
Kelenius
536388978f Conflict fix 2015-02-03 20:57:16 +03:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Kelenius
6f7a7177f2 Adds drying racks and updates pipes
You can now dry plants using a special machine, and you can now stuff
those plants into pipes to smoke then. It slowly transfers the reagents
from the plant into the smoker.
2015-01-16 02:57:59 +03:00
Zuhayr
32d799e53e Line ending conflict resolution. 2014-12-22 23:27:06 +10:30
Amunak
d28cb57f79 Merges upstream/dev to ref, resolves merge conflicts 2014-12-18 03:44:28 +01:00
Amunak
4882074739 Code formatting, EOL at EOF fixes, refactoring 2014-12-18 03:11:49 +01:00
Amunak
edffbc680d Fixed capitalization of most game items 2014-12-18 03:10:36 +01:00
Zuhayr
2214837449 Comments out combi-tool, fixes infinite range combitool. 2014-12-16 18:23:21 +10:30
PsiOmega
efb6adb452 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-14 00:27:16 +01:00
Zuhayr
7efae862a2 Fixes #7290 2014-12-13 23:04:13 +10:30
PsiOmega
2e34cb79a5 Morphic Clerical Kit
Buy the morphic chameleon stamp (or Stmap) now and get a new pen which fakes signatures for free.
Attempts to improve the value of said chameleon stamp as it feels rather expensive for what it do.
2014-12-12 10:07:42 +01:00
GinjaNinja32
6a975a1e6a Noise emotes
Conflicts:
	code/modules/mob/living/carbon/brain/say.dm
2014-12-07 12:09:02 +00:00
mwerezak
7049156519 Adds mask and oxygen tank to uplink kits that provide space suits. 2014-12-02 22:24:53 -05:00
Zuhayr
4d64a11acd Manual merge of head.dmi. 2014-11-14 23:02:16 +10:30
Zuhayr
ebbb9b36b5 Moved everything to a module-based hardsuit system.
Generalized all ninja power and gear code to work with new rig system.
Added shurikens, weapon mount, more work on deployable items.
Readded energy nets and energy blades.
Grenade launcher/charge stuff, interface stuff.
Renamed previously existing rigs to voidsuits, restructured rig and voidsuit files.
Refactored the energy net and teleportation proc.
Totally rewrote AI core/intellicard transfer procs.
Added rig sprites by Mordeth221, added step by steap suit sealing/inability to interfere with suit sealing process.
Updated map paths to use voidsuits.
Added chemical dispenser functionality, added power sink, added atom/drain_power() proc for later use.
Added rigsuit verbs, added voice changer.
Renamed MASKINTERNALS to AIRTIGHT, added internals checks for airtight helmets.
Added drain_power() procs to vulnerable machinery.
Reimplemented data theft.
Added suit maluses for losing your cell while wearing one.
Transitioned the rig suits to a back-mounted item that also controls a chestpiece.
Converted rig module to a storage item, convert ERT voidsuits to hardsuits.
2014-11-14 22:57:26 +10:30
Chinsky
43ee395c48 Merge pull request #7013 from Raptor1628/dev
ERT Update
2014-11-14 11:18:50 +03:00
Chinsky
1640b0a1c1 Merge pull request #7015 from Zuhayr/attackverbremoval
Attack proc removal/refactor.
2014-11-14 11:18:43 +03:00
Atlantiscze
efcfa5199b Robot analyzers can now be placed into tool belts. 2014-11-13 08:42:55 +01:00
Zuhayr
90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
Raptor1628
ba12d87388 ERT Update
Bevy of ERT changes and updates, outlined in a forum thread here:
2014-11-13 01:28:15 -05:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Zuhayr
df038c9fe8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-06 20:15:59 +10:30
Zuhayr
d0b3a3a39b Merge pull request #6601 from Mloc/bs12-calert
donut boxes now update their icon to properly reflect their contents
2014-10-06 19:37:24 +10:30
Mloc
9faec14707 donut boxes now update their icon to properly reflect their contents
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-05 19:24:30 +01:00
Mloc
dbff924849 fixes #6562
fixes #6571

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 17:48:17 +01:00
Zuhayr
223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
Whitellama
71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame
Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
2014-09-01 18:31:26 -07:00
Whitellama
d536f7d56a Fixed police tape not going in tactical combat belts 2014-08-31 15:34:21 -07:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Whitellama
aa0ab32a9c Egg boxes and donut boxes can be constructed from cardboard 2014-08-28 18:27:51 -07:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
MrSnapwalk
195805636b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ertv3 2014-08-21 11:40:35 -05:00
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
MrSnapwalk
9b464d268c ERT update 3: electric boogaloo. 2014-08-19 21:46:27 -05:00
Whitellama
26721cf0d5 Fixed eggs not going back into egg boxes 2014-08-19 02:44:58 -07:00
Zuhayr
43a7757252 Merge pull request #5982 from Jarcolr/customs
Adds the cigar case as a premium cigarette vending machine item.
2014-08-14 12:02:49 +09:30
Jarcolr
6c807199c9 Adds the cigar case as a premium vending item
5 may be a bit too much, but who is going to get all those coins,
anyway?
2014-08-13 12:10:43 +03:00