Commit Graph

6813 Commits

Author SHA1 Message Date
Fox McCloud
15c9873cdf Merge pull request #2224 from Markolie/shitcode
Strange reagent fix, tod --> timeofdeath
2015-09-29 18:25:04 -04:00
Markolie
8b2e62fc10 Strange reagent fix, tod --> timeofdeath 2015-09-29 22:03:04 +02:00
Crazylemon
734e0842e2 Fixed a few more reversed add_logs
Did a search, and found 3 of these to patch up. Perhaps there's
something left, perhaps not.
2015-09-29 11:56:51 -07:00
Tigercat2000
b09c4f7b85 Add a few variables to the AI announcment message
Variables added:
 - $species : Species name of the individual.
 - $age : Character age
 - $gender : Character gender, limited to female/male, sorry tumblr
2015-09-29 10:15:41 -07:00
Markolie
a810a37cdd Announcement update 2015-09-29 19:00:20 +02:00
Markolie
a135e67f71 Add AI text announcements 2015-09-29 06:59:27 +02:00
DZD
b990b6c71b Merge remote-tracking branch 'upstream/master' into vision 2015-09-28 19:03:14 -04:00
Spacemanspark
34b1a3a52f Adds the death message to monkeys again. Oops. 2015-09-28 17:40:24 -05:00
Spacemanspark
197f0b7219 makes *deathgasp less snowflakey 2015-09-28 16:58:28 -05:00
Spacemanspark
624b7cbc71 Gives IPC's a unique death message in a less snowflakey manner. 2015-09-28 16:57:16 -05:00
Spacemanspark
a02d843153 De-snowflakes *deathgasp 2015-09-28 16:55:04 -05:00
Fox-McCloud
3ec20a2313 Merge pull request #2208 from Markolie/fixes3
Fixes
2015-09-28 16:32:11 -04:00
Tigercat2000
ec2b31e435 Nuke wheelchair snowflake shit, fix the delay 2015-09-28 12:59:44 -07:00
Markolie
2c7d6f1a1b Law manager now only requires the host to be conscious 2015-09-28 18:25:50 +02:00
Fox-McCloud
6a2c7a82ff Merge pull request #2194 from tigercat2000/frunkenstien
Frankenstein
2015-09-28 02:58:44 -04:00
Aurorablade
4e64deb560 Revert "Revert "Nomnomnomnom""
This reverts commit 0239b80e27.
2015-09-27 22:41:44 -04:00
Markolie
f69beaeb00 Drone fix, runtime fixes 2015-09-28 03:34:33 +02:00
Markolie
f7fe8c8c6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes3
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-09-28 03:05:04 +02:00
Mark van Alphen
48a3d1ab9a Merge pull request #2176 from Fox-McCloud/janicarts-and-janitors
Janicart and Janitor Update
2015-09-28 03:02:04 +02:00
Mark van Alphen
d3ff9f50ed Merge pull request #2184 from Spacemanspark/master
Gives a special *deathgasp text to IPC's.
2015-09-28 00:27:19 +02:00
Markolie
b914544a87 Fixes 2015-09-27 22:50:09 +02:00
Markolie
6f2a753d89 Send questions to admins and mods 2015-09-27 21:38:08 +02:00
DZD
0ceaf664af Fix merge conflicts 2015-09-27 11:24:51 -04:00
Tigercat2000
a9af8b1532 Frankenstein
This commit does the following
 - Organs are no longer reliant on the species and DNA of their attached
   owner. Whoever made the organs (ex a spawned mob) transfers their
   species and DNA to the organ, and it uses that for calculations.
  - You may now attach organs cross-species; Yes, this means sticking
    skrell heads onto humans to make tentacle monsters. Or something.
 - IPC's may now choose their frame color.
  - I did say elsewhere this was not feasible; However, after taking a few
    hours to learn the systems behind all of it, I managed to hack
    something together. It's snowflakey, but fuck it, it doesn't need to
    be not-snowflakey.
2015-09-26 23:24:52 -07:00
Markolie
f63abafd2b Make robot components start powered 2015-09-27 08:21:07 +02:00
Markolie
24c503d738 Remove unnecessary logging from law procs 2015-09-27 07:52:02 +02:00
Markolie
fe20808108 Dead people can't emote 2015-09-27 05:03:05 +02:00
Spacemanspark
1ac203fb3d Gives the IPC *deathgasp a bit more flavor.
Delicious.
2015-09-26 16:06:17 -05:00
Spacemanspark
77bf9cb73d Gives a special *deathgasp text to IPC's. 2015-09-26 15:27:06 -05:00
Fox-McCloud
ae38db0bd8 Merge pull request #2172 from Markolie/zefixes
Various fixes
2015-09-26 16:25:22 -04:00
TheDZD
b30b93c551 Merge pull request #2182 from tigercat2000/FUCKINGBEES
fix infinite loop by nuking that entire shit loop
2015-09-26 13:54:43 -04:00
Tigercat2000
82308c2499 fix infinite loop by nuking that entire shit loop 2015-09-26 10:48:48 -07:00
Tigercat2000
c50781a743 Fix blank-text bug, with an angry comment. 2015-09-26 10:08:04 -07:00
Fox-McCloud
4413911688 Janicart and Janitor Update 2015-09-26 06:17:29 -04:00
Markolie
d4e5149389 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fluff
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
2015-09-26 05:12:52 +02:00
Markolie
95fa836d68 Various fixes 2015-09-26 04:51:36 +02:00
Tigercat2000
4b6a3ddcb6 -tg- SpaceMove update
This commit updates the spacemove system to -tg-'s; All objects now drift
in space, not just mobs. A few hardcoded space checks have been replaced
with has_gravity(); So it applies to zero-G as well as space.

Spacepods no longer drift, because their snowflakey shitcode just doesn't
work. So they just move.
2015-09-25 15:53:59 -07:00
Markolie
1b9375f096 Update drone messaging 2015-09-25 05:41:58 +02:00
Markolie
7da040d538 Mime mask fix 2015-09-25 05:09:29 +02:00
Markolie
e96103a02b Fluff item clean-up 2015-09-25 04:31:30 +02:00
Tigercat2000
4f3938d68b -tg- buckling system
This commit overhauls a bunch of systems so that buckling works for
any subtype of /obj. This means that space vines and chairs and beds all
use the same system. A lot of stuff has been touched.
2015-09-24 15:52:10 -07:00
Fox-McCloud
a26bf7172b Merge pull request #2139 from Markolie/sql
Nuke the privacy poll, offer ghosts control option, memo update, SQL update, fixes
2015-09-23 23:42:06 -04:00
Markolie
1a2459de0a check_rights/R_MOD update 2015-09-24 04:35:04 +02:00
Mark van Alphen
c6fed9e7bc Merge pull request #2137 from Crazylemon64/pai_nanopaste_repair
Allows Repair of pAIs with Nanopaste
2015-09-24 03:08:09 +02:00
DZD
0a7f50bbe2 Spelling and sanity fixes 2015-09-23 16:20:06 -04:00
Markolie
e95eb8f3b8 Let admins create server polls 2015-09-23 20:17:21 +02:00
DZD
37ea591087 Shadowling, changeling, and vision fixes/changes 2015-09-23 13:00:58 -04:00
Markolie
b4a4f29f3f Vox/Plasmaman spawn/wizard update 2015-09-23 08:14:12 +02:00
Mark van Alphen
f62970c553 Merge pull request #2135 from Fox-McCloud/dismemberment-fix
Explosion Dismemberment Fix
2015-09-23 07:09:38 +02:00
Markolie
9adff714b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql
Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt
2015-09-23 07:07:17 +02:00