Cheridan
|
213d324d5f
|
Merge pull request #15136 from Incoming5643/nonhumanunlessprovenotherwise
Command Roles are properly restricted to just humans
|
2016-02-02 22:28:18 -06:00 |
|
duncathan salt
|
0915bcf78c
|
Merge pull request #15068 from PKPenguin321/fuckgitwithacarrot
carrot shivs strike back
|
2016-02-02 19:04:20 -06:00 |
|
tkdrg
|
0f47866cad
|
Merge pull request #15122 from JJRcop/bugfixmoji
Fixes emoji issues to do with adminPM and OOC formatting
|
2016-02-01 19:44:16 -03:00 |
|
Incoming
|
58f3f5207e
|
Command Roles are properly restricted to just humans instead of everything except lizards, catgrills, and plasmamemes (when the config is set for that).
|
2016-02-01 16:54:07 -05:00 |
|
tkdrg
|
f9885841f1
|
Merge pull request #15074 from Chiefwaffles/Slipocalypse
Adds Uplink Soap Clusterbang for 6TC
|
2016-02-01 00:01:33 -03:00 |
|
duncathan salt
|
ccba4396b1
|
Merge pull request #15105 from KorPhaeron/fish
Makes Cayenne a proper carp, adds sentience potion to nuke op uplink
|
2016-01-31 20:52:00 -06:00 |
|
Chiefwaffles
|
a4d5617289
|
Changed TC cost to 6.
|
2016-01-31 18:22:57 -08:00 |
|
tkdrg
|
0d3e68c1d0
|
Merge pull request #15099 from PKPenguin321/patch-12
Dice of Fate -> Die of Fate
|
2016-01-31 22:20:05 -03:00 |
|
tkdrg
|
5e00afd4cc
|
Merge pull request #14914 from PKPenguin321/is-that-a-knife-in-your-shoe-or-are-you-just-happy-to-OOF
Adds the ability to store knives/pens/edaggers in certain shoes
|
2016-01-31 22:00:43 -03:00 |
|
PKPenguin321
|
cdfefbf92b
|
fixes travis
o n e l i n e c o m m i t s
|
2016-01-31 16:26:21 -08:00 |
|
tkdrg
|
faa81107d6
|
Merge pull request #15079 from KorPhaeron/ctf_bugfix
CTF bugfixes and control point
|
2016-01-31 21:23:52 -03:00 |
|
KorPhaeron
|
b56879d21e
|
Parentheses
|
2016-01-31 18:16:05 -06:00 |
|
PKPenguin321
|
eeda4bbd04
|
updates var names, allows clown shoes to hold bike horns
zilenans around the globe, rejoice
|
2016-01-31 15:54:32 -08:00 |
|
PKPenguin321
|
616b24dda9
|
changes istype to is_type_in_list, adds a w_class check
also changes some var names to be less knife-specific and more item-specific
|
2016-01-31 15:52:11 -08:00 |
|
duncathan salt
|
52e60d80c9
|
Merge pull request #15089 from Firecage/atmos2modules
Take two of grouping the atmos files in modules.
|
2016-01-31 17:47:47 -06:00 |
|
KorPhaeron
|
aed4a51223
|
Restores factions to being lists
|
2016-01-31 17:46:01 -06:00 |
|
tkdrg
|
5b74ac82d7
|
Merge pull request #15031 from Fayrik/riseofthemachines
Adds pAI Control to Simple Robots
|
2016-01-31 19:02:52 -03:00 |
|
Fayrik
|
e199f81de2
|
This better be third time lucky.
|
2016-01-31 21:54:30 +00:00 |
|
tkdrg
|
013016d4f3
|
Merge pull request #14103 from bgobandit/valentinestuff
Adds valentines and candy hearts for Valentine's Day.
|
2016-01-31 18:49:28 -03:00 |
|
Fayrik
|
5548180158
|
Cardpulling works only once now, new proc, removed mulebot emag mode.
|
2016-01-31 21:12:50 +00:00 |
|
Remie Richards
|
0550e75804
|
Merge pull request #15039 from Thunder12345/stormtrooper
Adds Syndicate Stormtrooper mobs
|
2016-01-31 20:50:39 +00:00 |
|
Chiefwaffles
|
170b592377
|
Ups price to 4TC. Soap Spawnergrenade added to replace soap as payload.
|
2016-01-31 12:29:00 -08:00 |
|
Remie Richards
|
8f3245282e
|
Merge pull request #14944 from tkdrg/agoodideaforonce
adminmoreinfo links to antags in ahelp are now red
|
2016-01-31 19:58:24 +00:00 |
|
Remie Richards
|
7f7cfa1326
|
Merge pull request #14838 from tkdrg/stealthmin_improvement_improvement
Stealthmin will no longer make humans invisible
|
2016-01-31 19:58:13 +00:00 |
|
Fayrik
|
261796e6a7
|
The easy way works better. Whoops.
|
2016-01-31 19:41:08 +00:00 |
|
Fayrik
|
a674179746
|
Now using attack logs for pai history. PAI to pAI. Removed unnecessary spacing on if statements.
|
2016-01-31 19:29:36 +00:00 |
|
JJRcop
|
ab99043d31
|
Fixes emoji issues to do with adminPM and OOC formatting
|
2016-01-31 12:57:43 -05:00 |
|
tkdrg
|
9d8275e6e8
|
Merge pull request #15078 from KorPhaeron/space_suit
Removes inhand slowdown from space suits
|
2016-01-31 13:58:48 -03:00 |
|
tkdrg
|
c9aef1eb28
|
Merge pull request #15071 from Incoming5643/goof_creme
Fixes Super Obscure Spray Tan Bugs
|
2016-01-31 13:57:15 -03:00 |
|
tkdrg
|
2f9cf25120
|
Merge pull request #15000 from KorPhaeron/hat_buffs
Buffs cakehat
|
2016-01-31 13:45:55 -03:00 |
|
tkdrg
|
7891ac2805
|
Merge pull request #15034 from AnturK/shuttle_templates
Adds map template datum and size preloading
|
2016-01-31 13:33:30 -03:00 |
|
tkdrg
|
1158d540de
|
Merge pull request #15058 from erwgd/BotanyToolsShakersForVendors
Added botany tools, salt and pepper shakers to vendors, changed how you get rice seeds
|
2016-01-31 13:23:21 -03:00 |
|
tkdrg
|
6b3e02e9be
|
Merge pull request #15056 from bgobandit/mimefeels
Mimes can now alter their mask to display different emotions.
|
2016-01-31 11:51:40 -03:00 |
|
tkdrg
|
94a138c2ad
|
Merge pull request #15057 from xxalpha/lowpowerverb
Fix runtime with new cyborg verb
|
2016-01-31 11:46:28 -03:00 |
|
tkdrg
|
da056af83f
|
Merge pull request #15018 from LanCartwright/fungaltbchange
removes fungal tb from traitor
|
2016-01-31 11:36:06 -03:00 |
|
KorPhaeron
|
5c8b8b8148
|
Red shields for red hardsuits
|
2016-01-31 04:32:40 -06:00 |
|
KorPhaeron
|
afc0e1e4c6
|
Capture the Flag fixes and control point
|
2016-01-31 04:20:35 -06:00 |
|
KorPhaeron
|
15b713e1be
|
Cayenne is a proper carp
|
2016-01-30 22:09:42 -06:00 |
|
PKPenguin321
|
5854c87ce5
|
removes the letter c
dice -> die
|
2016-01-30 18:38:35 -08:00 |
|
Fayrik
|
202805c315
|
Stop pAI self-ejection.
|
2016-01-31 00:58:26 +00:00 |
|
bgobandit
|
40a2d8e6d1
|
no spaces, cycle proc, honk honk honk
|
2016-01-30 19:47:31 -05:00 |
|
Fayrik
|
4c045b21ed
|
Some tasty fluff
|
2016-01-31 00:29:29 +00:00 |
|
Fayrik
|
0871ca36a2
|
MULEbot pAI eject button, admin logs and a MULEbot emag function.
|
2016-01-31 00:29:16 +00:00 |
|
Fayrik
|
b9162fbb3e
|
Tweaked card ejection slightly.
|
2016-01-31 00:25:51 +00:00 |
|
Fayrik
|
299136b91c
|
PAI's can now be used on basic robots to give them more advanced personalities.
|
2016-01-31 00:21:58 +00:00 |
|
bgobandit
|
11043a07f6
|
Adds scared mime mask and adjusts sad mime mask :(
|
2016-01-30 18:59:25 -05:00 |
|
PKPenguin321
|
f001077b1a
|
fixes the extraneous line removals
hopefully
|
2016-01-30 15:54:39 -08:00 |
|
bgobandit
|
170a87e69b
|
Alt-click and action button
|
2016-01-30 16:32:30 -05:00 |
|
xxalpha
|
062cb76e29
|
Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj
|
2016-01-30 19:45:45 +00:00 |
|
xxalpha
|
83a4491756
|
Space icon state function is a define.
|
2016-01-30 19:44:20 +00:00 |
|