1380 Commits
Author SHA1 Message Date
monster860 3295020088 Merge branch 'master' into ui_plane 2016-06-19 12:38:00 -04:00
FreeStylaLT 950b718551 adds extended oxygen tank to list, also fixed indentation in last commit I think 2016-06-17 16:56:07 +03:00
FreeStylaLT bbb9465108 removes stimulants (oops) adds syndicards, regular brown shoes and syndicate briefcase to loot drop list (double oops) 2016-06-16 05:00:28 +03:00
FreeStylaLT e712baf111 removed thermals, binary key and adrenal implants from the list 2016-06-16 04:26:51 +03:00
FreeStylaLT 9e95dfcd17 added the actual items to the list 2016-06-16 00:09:13 +03:00
monster860andFox McCloud 42639bcab5 Traders Event (#4016)
* Traders Event

* lien notes

* Fixes indent

* Gets rid of things Fox doesn't like.

* how did that get deleted

* Get rid of things maintainers don't like

* Adds some crates to the shuttle, and a recall console to the base.

* EVENT_LEVEL_MAJOR, and make it weight 0 (out of rotation)

* line nutes
2016-06-11 12:47:20 -04:00
Matt Milosevic bc86a86ece Hopefully final 2016-06-08 18:30:26 +02:00
monster860 64ea452f20 Puts UI on it's own plane 2016-06-06 17:12:28 -04:00
Aurorablade 0ac1a0f759 code'sie has risen 2016-05-29 23:37:40 -04:00
Aurorablade ef5b2d7c8e more things 2016-05-25 02:32:26 -04:00
Aurorablade ffb0201a25 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-05-21 21:59:29 -04:00
Aurorablade dc5a74f8f6 start of VG ports 2016-05-17 00:27:07 -04:00
Fox-McCloud e22bc8a42b Foam Fixes+Changes 2016-05-12 23:47:30 -04:00
Aurorablade f99a8141c5 TG Ports and datum cult screwups 2
I may have missed something
2016-05-11 20:15:36 -04:00
Tastyfish 71a7f10b7f Unbroke the pda manifest 2016-05-05 20:36:32 -04:00
Tastyfish 646fb39f2d Replaces in-script json encoder/decoder with the native 510 procs 2016-04-30 19:15:07 -04:00
Tigercat2000 0f70e6810b -tg- OOP Hud Refactor
- Added 4 new HUD styles
 - Humans recreate their hud if they change their UI pref mid-game
 - Refactored how objects are added to the client screen
 - HUD's are now handled by subtype and mob/proc/create_mob_hud()
 - HUD visibility is no longer chained directly to the F12 button, it's a proc on HUD datums now
 - Mobs only create/destroy their HUD when necessary, not every Login()
 - Destroyed aim-mode, it didn't work and I couldn't make it work.
 - Renamed all of the screen1_x.dmi files to screen_x.dmi
 - Removed screen1.dmi, screen_gen.dmi now handles generic icons.
2016-04-21 20:28:08 -07:00
FalseIncarnate bdd379c5a2 Fixes Anomalies Not Neutralizing
Fixes #4167
2016-04-15 00:12:42 -04:00
Tastyfish 7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Tastyfish 85a58e59a6 Fixes to_chat script fuckery 2016-04-06 20:41:45 -04:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Tastyfish 6a8ea815b2 Merge branch 'master' into buttbots2
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
2016-03-31 13:33:46 -04:00
Fox McCloud d1765e0e14 Merge pull request #4019 from tigercat2000/disease1
-tg- disease1
2016-03-30 21:29:58 -04:00
Crazylemon64 7aa519723b Merge branch 'master' of https://github.com/Crazylemon64/Paradise into metal_foam_space_flooring 2016-03-28 23:13:43 -07:00
Crazylemon64 00a39f5c83 Fixes stuff and stuff 2016-03-28 23:03:17 -07:00
Tigercat2000 ad2cf86898 -tg- disease1
Wee! Readds Disease1, kills off disease2, and finally removes poop.dmi
(fucking piece of shit)

Needs WAY more testing, most of which I don't know how to do yet, because
I've never used this system. Fun!

Changes:
 - Virus2 has been removed completely.
  - Some symptoms have not been readded. Aka, none of them have been
    readded, I just wanted to get this shit ported.
  - Virology has been updated slightly to mirror -tg-'s boxstation, as the
    virus2 machines are gone.
 - Welcome back, disease1
  - The centrifuge, vials, splicer, analyzer, growerthing, have all been
    replaced by the PanD.E.M.I.C. 2220
  - No symptoms have been completely removed; However, vision symptoms
    have been disabled pending byond 510, and genetics symptoms have been
    disabled until "when I figure out how to fix them".
  - Advanced Mutation Toxin now uses a disease, which turns people from
    species, to slime person, to slime. Slime people are instantly turned
    to a slime.
  - Diseased touch now give people appendicitis. Yes, they VANT YOUR...
    appendix.
  - Virology now has a fridge with the following in it:
    - Antiviral Syringes
    - 1 Rhinovirus culture
    - 1 Flu culture
    - 1 Bottle of Mutagen
    - 1 Bottle of Plasma
    - 1 Bottle of Synaptizine
  - A few more things, which I can't remember and can't look at while writing
    this commit. Sometimes, git hurts.

TODO:
 - Test more shit and figure out how the PanD.E.M.I.C. works/is supposed to
   work.
 - Fix genetics symptoms.
 - Give vampires a less shitty diseased touch.
 - Add appendicitis event.
 -
2016-03-27 21:24:00 -07:00
Tastyfish 25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
Mieszko Jędrzejczak 135687fe7e Adds party grenades 2016-03-23 12:11:39 +01:00
Crazylemon64 fa14522a1f Makes a different, more fragile, floor type for the metal foams 2016-03-18 20:12:27 -07:00
Crazylemon64 09f06ff6fc Metal foam walls will now also produce plating on space tiles 2016-03-18 16:25:19 -07:00
Aurorablade 5896ebc1ca bwoink 2016-03-16 03:53:38 -04:00
Fox-McCloud 43ed8e8f0e whoops 2016-03-12 21:58:50 -05:00
Fox-McCloud 57b6475248 Xeno Tweaks and Fixes 2016-03-12 21:50:06 -05:00
Fox-McCloud 0dc0ada004 Facehugger and Embryo Fixes 2016-03-12 03:00:54 -05:00
Tastyfish 0e0225b1ee Fixes several midround antag assignments not asking ghosts first 2016-03-07 03:03:45 -05:00
Fox McCloud ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
Fox-McCloud e2bb00a5b1 Miming Refactor 2016-02-28 22:40:00 -05:00
Fox McCloud 166b3951b8 Merge pull request #3676 from Aurorablade/ThePutsaNewShadeOnThings
Fethas Carnival of horrors: A new shade for the detective
2016-02-26 20:02:41 -05:00
Aurorablade 5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade 9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Tastyfish 4f3ce4ecbc Adds picture frames 2016-02-21 21:00:45 -05:00
Aurorablade 2c38d8fb61 yeah 2016-02-21 05:54:10 -05:00
Aurorablade 545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
VampyrBytes de45fc9aba Cleans up slipping code
Puts slipping into one proc rather than being dealt with individually by
each item.

The only changes to functionality here are where it would have been
possible to slip on some items whilst flying. It will make any changes
decided on in #3490 or any future changes far more easy to implement
2016-02-03 09:44:32 +00:00
Aurorablade 25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Tastyfish 511a9757de Renamed manifest section Support to Service 2016-01-28 22:30:45 -05:00
Tastyfish ba2f797ed3 Adds Supply section to manifest 2016-01-28 21:12:20 -05:00
Aurorablade 51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Fox-McCloud 38149bfc7d Merge remote-tracking branch 'upstream/master' into sec-rifle 2016-01-03 22:35:28 -05:00