b0cfaf401f
Random Names for Lizards
...
Lizards now have their own list of names to pull from when randomizing their names.
2015-07-05 18:35:56 -06:00
71a5543976
Nazism
2015-07-05 11:36:29 -06:00
737783b084
Update
2015-07-05 00:32:13 -06:00
3c6398bd46
Gives the Capture objective a better description.
...
Because what the fuck is a capture point?
2015-07-05 00:19:05 -06:00
b42aa8238f
Merge pull request #9816 from Sabbat/SabbatArmorRune
...
Armor rune updated to allow multiple choices based on what you are we…
2015-07-05 05:48:58 +03:00
60a5a83757
Merge branch 'master' of https://github.com/tgstation/-tg-station into ChamFix
2015-07-04 22:31:18 +03:00
38c2a54d9d
Replaces magic number with define
...
Replaces magic number with define
2015-07-04 22:30:46 +03:00
4d3d4be753
Merge pull request #10353 from Ricotez/catfix
...
FIX for randomly spawning with cat parts.
2015-07-04 16:58:56 +02:00
2b534cf5aa
- Fixes shuttle loan events not bringing anything to the station. The objects created for the event were destroyed at Centcom.
...
- Removes supply order crates from shuttle loan events. These were pretty unintuitive, as you needed to accept the crates separately.
- Adds a new shuttle loan event: Centcom wants you to help in a virus research program. I feel this is a more controlled way of bringing diseases on the station compared to the disease outbreak event.
- Fixes camera failure event
- Fixes spanish flu, adds spanish flu culture bottle
2015-07-04 01:46:50 +03:00
4d91dbb9f0
Adds adminlogging for Toggle Purrbation.
2015-07-03 22:48:34 +02:00
97b8286a00
Fixes some bugs introduced by Datum Gangs
...
- Fixes Quick-Create Gang button
- Fixes bosses unable to promote lieutenants
2015-07-03 12:37:52 -06:00
7b6867bc21
Merge pull request #10328 from Ikarrus/datumgangs
...
Datum-Based Gangs [Ready]
2015-07-03 10:35:07 -05:00
b1bf4d04fe
Merge pull request #10209 from Ricotez/human_mutantparts
...
Gives humans two types of mutant accessories: ears and (human-specific) tails.
2015-07-03 08:36:36 +03:00
3814dc208a
Gang-Based Datums
2015-07-02 22:18:11 -06:00
572121ecc4
Merge pull request #10244 from Ikarrus/workplacesafety
...
Workplace "Accidents"
2015-07-03 05:05:36 +03:00
25b134581b
Resolved Conflicts:
...
code/game/gamemodes/gang/gang_pen.dm
2015-07-02 15:15:41 -06:00
2191a2c33d
Datum-Based Gangs
2015-07-02 15:12:55 -06:00
a405a14ab7
More better.
...
Some cleaning
2015-07-02 21:30:03 +01:00
4a86be4883
Merge remote-tracking branch 'upstream/master' into boxesofbananium
...
Conflicts:
code/game/objects/items/stacks/sheets/mineral.dm
2015-07-02 18:49:41 +01:00
b2349384da
Removed shit loop, fixed autolathe interface, removed debug msg.
2015-07-02 18:44:39 +01:00
6ad41f96c0
Code uses harden
2015-07-02 01:14:35 +01:00
9f0a0f1427
Changed filename
2015-07-01 21:28:35 +01:00
e8313287fe
Less for loops, more direct references.
2015-07-01 21:17:53 +01:00
55bec2d24d
Adds a thrownby var that's used by admin logging.
2015-07-01 13:00:12 -06:00
cbf041c054
MATERIAL DATUM
2015-07-01 18:32:30 +01:00
cfb5e724b6
Material container, all items can have materials, wake me up
...
cant wake up
go to sleep debug
2015-07-01 03:34:47 +01:00
acd297e7f5
-Added new option to the VV menu drop-down list: Toggle Purrbation.
...
-Putting a human on purrbation gives them cat ears and a cat tail, and sends them the message 'You suddenly feel valid.'
-Removing a human from purrbation reverses the effects, and sends them the message 'You suddenly don't feel valid anymore.'
-Renamed "Long and Smooth" tail to "Cat" tail. I wasn't kitten anyone with the old name.
-Updated changelog.
Forgot to include these two in the last commit:
-Cat ears and tail now use your hair colour instead of your mutant colour.
-Added changelog.
2015-06-30 20:17:55 +02:00
cd01bdee8b
Revert "Makes N2O an effective oxidizer"
2015-06-30 11:18:53 -05:00
0216335cb4
Merge pull request #9987 from as334/atmos
...
Makes N2O an effective oxidizer
2015-06-30 16:17:54 -05:00
782fdd7678
Merge pull request #10259 from Razharas/DemonFix
...
Fixes dummy objects being rightclick visible
2015-06-30 23:04:30 +02:00
dd9f0c67b9
Fixed wizarditis message
2015-06-30 16:19:53 +02:00
3b4dbc4f27
Merge pull request #10216 from nukeop/syndiesurgerybag
...
Add Syndicate surgery bag to uplink
2015-06-29 15:52:55 -05:00
8a26ff2527
Fixes dummy objects being rightclick visible
...
Fixes dummy objects being rightclick visible
2015-06-29 15:38:39 +03:00
182e11430d
Fixes chameleon mutation
...
Fixes chameleon mutation
2015-06-29 14:21:06 +03:00
eb4d6c66a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into VarEdit
2015-06-29 13:42:23 +03:00
cbee684951
Macro/Micro bombs are now restricted to the Nuclear game mode.
...
Also fixes some broken spans.
2015-06-28 09:57:24 -06:00
acca364c50
Merge pull request #10191 from Xhuis/thoseDogsAreSleepingByTheWay
...
Gang Fighting Styles
2015-06-28 17:22:38 +03:00
e8d3deafab
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
...
Conflicts:
code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
98c2bd18db
Merge pull request #9620 from xxalpha/mineralcontainer
...
Fixed banana shoes mineral handling.
2015-06-28 15:07:17 +03:00
0316a836cb
add a Syndicate surgery dufflebag full of tools to the uplink
...
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
2015-06-28 02:54:49 +01:00
119c4d7929
Merge pull request #10186 from Anonus/m(i/a)crobombs
...
M(i/a)crobomb Adjustments
2015-06-28 00:19:06 +03:00
352500d341
Sprites bo staff, adds custom martial art
2015-06-27 15:32:54 -04:00
3d556ea970
Some varedit improvements
...
Fixed give spell window hiding most important part of the spell types
Added call proc to varedit so all things you can open in varedit you can
also call procs on
2015-06-27 18:00:57 +03:00
c5a47adb64
Fighting Styles, 1
2015-06-26 14:19:52 -04:00
8c9169f9a8
Merge pull request #10144 from phil235/StimulantsBuff
...
Buffs stimulants reagent.
2015-06-26 10:37:46 -05:00
d85a612ee8
Microbombs to 2 TC
...
So that traitors don't get to have maxcap for 12 TC
2015-06-26 11:37:33 -04:00
90a6a8ca96
Revert "Revert "MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS""
2015-06-26 02:45:02 +03:00
97aaa5fb8d
Revert "Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs onc…"
2015-06-26 02:44:20 +03:00
69d6cd4f94
Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs once more"
2015-06-26 02:16:02 +03:00
a40697c545
Revert "MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS"
2015-06-26 02:12:29 +03:00
Ikarrus
Razharas
Razharas
Swag McYolosteinen
Perakp
Ricotez
Cheridan
xxalpha
phil235
spasticVerbalizer
phil235
barackobama
Xhuis
Anonus