Commit Graph

7479 Commits

Author SHA1 Message Date
Segrain
26f40359fc Fix for unpinning humans. 2014-02-10 01:38:32 +03:00
Segrain
cba6dac062 Fix for unlocking exploit. 2014-02-09 13:34:40 +03:00
Segrain
5bead0c183 Adding blood to humans. 2014-02-09 13:32:42 +03:00
Segrain
8e11dabf96 Bloody feet. 2014-02-09 13:30:28 +03:00
Loganbacca
d50d49cedb Bullet inscriptions
- Can inscribe text into bullets by using a screwdriver on a bullet casing
- Does not work on non-metal type bullets (i.e. rubber bullets, beanbags, stunshots, etc)
- Added weakbullet subtypes "rubber bullet" and "beanbag" with appropriate names
2014-02-09 22:52:27 +13:00
DJSnapshot
cf67b34780 Merge pull request #4401 from Ravensdale/APC
Self-naming APC's! Now even mapped in APC's will rename themselves
2014-02-08 18:18:29 -08:00
DJSnapshot
b47acbbcfb Merge pull request #4396 from RKF45/blob
Readjusts blob random event
2014-02-08 18:17:17 -08:00
Loganbacca
b34ceb5cfd Fixed shrapnel embedding 2014-02-09 14:56:16 +13:00
Ravensdale
677e8a29c8 Tweak APC self-naming so they read better when examined or interacted
with. Thanks Sky for the suggestion and Mloc for the why.
2014-02-08 06:04:33 -08:00
Ravensdale
9d1e160a60 Self-naming APC's! Now even mapped in APC's will rename themselves
depending on what zone they're in. Makes more mapping sanity.
2014-02-07 21:48:37 -08:00
RKF45
64dcb5a693 Readjusts blob random event 2014-02-07 19:57:46 +01:00
Rob Nelson
a8d3c0601b And now tested in game, with some fixes. 2014-02-06 23:52:58 -08:00
Rob Nelson
54e4c48f7d Missed the gene Life() call. 2014-02-06 23:19:52 -08:00
Rob Nelson
3121e4fb2d DNA2 Bug Fixes - Part 2
We discovered that most of the problems were were having was because of BYOND passing lists (e.g. SE and UI) by-ref instead of the assumed by-val.

This commit adds dna.Clone() and (UI|SE).Copy() where needed.  These should be used where DNA or SE/UI lists are COPIED, otherwise changes made in the reference will affect the real strand.

This change also messes with the gene activation logic.
2014-02-06 23:07:35 -08:00
Zuhayr
27dba28a54 Merge pull request #4394 from Baystation12/master
Removes mechs, removes Roboticist, moves exofabs to R&D.
2014-02-07 13:18:37 +10:30
Zuhayr
353ee43bae Uniform.dmi merge resolution. 2014-02-05 18:35:13 +10:30
Zuhayr
f1b77d0ed6 Master merge. 2014-02-05 18:34:23 +10:30
DJSnapshot
64ff444fa7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into antag
Conflicts:
	icons/mob/uniform.dmi
2014-02-04 23:55:27 -08:00
Ccomp5950
9665e8c4df Mouse Attack_Logs disabled. Admins rejoice.
No more mice in disposals spamming the hell out of admins everytime someone flushes items.
2014-02-05 00:14:45 -06:00
DJSnapshot
3026a1306a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into antag 2014-02-04 15:10:13 -08:00
Iamgoofball
2ec805630e Because we HAVE to define Del() three times
/obj/item/device/gps/Del()
	GPS_list.Remove(src)
	..()
/obj/item/device/gps/Del()
	GPS_list.Remove(src)
	..()
/obj/item/device/gps/Del()
	GPS_list.Remove(src)
	..()
2014-02-04 11:30:35 -08:00
Chinsky
e7c22c28c7 Merge pull request #4379 from Segrain/master
Smallfix.
2014-02-04 01:44:32 -08:00
Segrain
4b8d5c4f14 Code cleanup. 2014-02-04 08:16:06 +03:00
Chinsky
9a4bcc60b4 Merge pull request #4377 from Ccomp5950/ai_announcements_tease
Commented out the AI Announcement verbs
2014-02-02 23:30:55 -08:00
Segrain
83246df6d5 Fix for #4297. 2014-02-03 07:32:53 +03:00
Segrain
9ff5776c9f Pepperspray safety. 2014-02-03 05:10:04 +03:00
Segrain
1039fc9eaf Spray sizes. 2014-02-03 05:08:08 +03:00
Segrain
6af8f01cab Code cleanup. 2014-02-03 05:00:15 +03:00
Segrain
4fe85651b6 Taperolls for cyborgs. 2014-02-03 04:46:47 +03:00
Segrain
fcc4560e92 Displaying delayed time. 2014-02-03 04:38:38 +03:00
Segrain
b7059519c2 Merge remote-tracking branch 'upstream/master' into dev 2014-02-03 04:36:03 +03:00
Ccomp5950
3a54d96b7a Merge pull request #4374 from Loganbacca/bayfix
Broken heart fix
2014-02-02 17:22:25 -08:00
Ccomp5950
35f534854a Commented out the AI Announcement verbs
Now the AI won't get it's hopes up that it can have the
CAPTAIN REPORT TO THE BAR FOR JOHNSON INSPECTION
2014-02-02 16:57:07 -06:00
Loganbacca
70a1c768ad Broken heart fix
Code was using a switch with variables in it. This doesn't work.
Replaced it with an if..else sequence.

Thanks to the guys from Paradise for finding this.

Note: this only fixes literal heart problems, it won't do anything for relationship issues.
2014-02-03 00:28:15 +13:00
Ccomp5950
0980493981 Merge pull request #4368 from Loganbacca/prefs
Character setup underwear rendering
2014-02-01 14:58:38 -08:00
Ccomp5950
d38af0c44b Typo fix: corpotate -> corporate.
And superfluous U removal 'MURIKA!
2014-02-01 15:25:00 -06:00
Zuhayr
e79fb1d890 Merge pull request #4366 from RKF45/dough
Reintroducing the dough-based cooking system.
2014-02-01 05:13:10 -08:00
Chinsky
3a913e426c Merge pull request #4360 from RKF45/dev
I am doing that just for genetecists wearing monkey suits.
2014-02-01 03:33:54 -08:00
Chinsky
79fd66c685 Merge pull request #4364 from Loganbacca/collars
Suit collars
2014-02-01 03:30:36 -08:00
RKF45
4b6dc4d257 Diona roasts needs cooperation for acid 2014-02-01 11:16:55 +01:00
Loganbacca
6bf6f6d849 Added underwear rendering to character setup screen
Also culled unused underwear names from global_lists.dm
2014-02-01 17:53:13 +13:00
RKF45
8fbcda2a0b Reintroducing the dough-based cooking system. 2014-02-01 02:17:38 +01:00
Loganbacca
44498dc5eb Tail rendering fix
Spotted this while working on collars code
Moved tail layer before hand layers, so tails don't render over held items
2014-02-01 13:30:18 +13:00
Loganbacca
c6964b1a1a Cleaned collar rendering code
Removed colon
Removed need for collar variable
Corrected TOTAL_LAYERS define
2014-02-01 13:25:09 +13:00
Ccomp5950
e72c824b90 Deadchat sanitized so players can't use HTML. 2014-01-31 16:41:12 -06:00
DJSnapshot
810de4ddaa Merge pull request #4337 from Baystation12/dev-freeze
0.1.8 Staging [Do not merge]
2014-01-31 12:40:15 -08:00
Segrain
ece3556143 Smallfix. 2014-01-31 16:31:17 +03:00
Segrain
4df59faf76 Surgery tracking. 2014-01-31 16:28:24 +03:00
Segrain
93a29c60b3 Verb category. 2014-01-31 16:22:31 +03:00
Loganbacca
41dccddbef Suit collars
Adds a collar overlay above the helmet layer if the suit has one
Suit needs an identically named sprite in icons/mob/collar.dmi
Suit also needs 'collar = 1' set in utility.dm

Trenchcoats are go!
2014-02-01 02:17:52 +13:00