Commit Graph
19101 Commits
Author SHA1 Message Date
nik707andGitHub f9b257c2c6 Merge pull request #7809 from Citadel-Station-13/kevinz000-patch-17-1
While we're at it let's remove beepsky hating on furries too
2018-12-15 15:20:35 -06:00
nik707andGitHub 90855b2aea Merge pull request #7812 from Citadel-Station-13/kevinz000-patch-19
Nerfs banana spiders. Banana spiders however actually work now.
2018-12-15 15:19:39 -06:00
nik707andGitHub 5eaeb6b928 Merge pull request #7824 from Citadel-Station-13/kevinz000-patch-23
new players no longer see aooc
2018-12-15 15:17:05 -06:00
nik707andGitHub a88434f69e Merge pull request #7823 from Ragolution/master
Adjusts Egg Nog to be more immersive (and just in time for the Winter Ball)
2018-12-15 15:16:26 -06:00
Ragolution ff8a2337ca Removes outfitting cost
Removes loadout cost from sweaters because they're just sweaters.
2018-12-15 16:02:51 -05:00
Ragolution 01c589f172 5th Port Sweater Adjustments
Puts 5th port sweaters into the correct category and file.

Fixes sweaters not spawning.
2018-12-15 06:38:32 -05:00
nik707andGitHub 2852daa27d Merge pull request #7815 from Trilbyspaceclone/Reece
New admin buttens for Reece
2018-12-14 21:05:13 -06:00
kevinz000andGitHub 941d5fcfba Update aooc.dm 2018-12-14 01:34:39 -08:00
Ragolution 2b97d32dd2 Improves Eggnog
Changes icon state to new icon, rather than standard glass of yellow juice. Also adds flavorful description.
2018-12-14 01:49:05 -05:00
Ragolution 517a6d71ef Revert "Update drinks.dm"
This reverts commit f76d93a368.
2018-12-14 01:45:39 -05:00
Ragolution 8dd8fb4167 Update drinks.dmi
Adds new icon for glass of eggnog as state nog3
2018-12-14 01:41:45 -05:00
RagolutionandGitHub f76d93a368 Update drinks.dm
* Changes flavor text to reflect status as not a carton.
2018-12-14 01:26:34 -05:00
Trilbyspacecloneandkevinz000 9961d0e321 More heirlooms! Also changes Mime/Clown's (#7793)
* More heirlooms

* Update negative.dm

WIP

* makes the knife

* dusty

* Makes everone happy

* grammer
2018-12-13 11:52:48 -08:00
Trilbyspacecloneandkevinz000 3b24774714 Buffs NanoMed Wall units! (#7794)
* removes some rouge things

* Kev wishes
2018-12-13 11:51:55 -08:00
Trilbyspacecloneandkevinz000 33b16bbf71 Update Sleeper.dm (#7797) 2018-12-13 11:50:30 -08:00
Trilbyspacecloneandkevinz000 c9c8207c6c Makes Bubble Gum a male - Requested by LeglessLizard (#7820)
* Makes Bubble Gum a male

* var*

* >uses a unused var
2018-12-13 11:49:39 -08:00
deathride58andkevinz000 fc3cca6a19 lets try to fix heat not spreading - makes hotspot_expose force turf air updates (#7814) 2018-12-13 11:48:57 -08:00
nik707andGitHub f3e783713d Merge pull request #7813 from deathride58/toohardfortg
Makes sparks, welding tools, etc, ignite plasma a lot easier
2018-12-12 18:26:31 -06:00
deathride58 11402e5337 this shit is much too hard for tg to handle - makes hotspot_expose ignite plasma and tritium a lot easier 2018-12-11 16:22:47 -05:00
kevinz000andGitHub df55b465b1 removes poi spam and cleans up code 2018-12-11 08:37:10 -08:00
kevinz000andGitHub 33f997c10d Update banana_spider.dm 2018-12-11 08:34:22 -08:00
izzyinboxandkevinz000 ece617e40d Revert "doubles the max say/emote size to match the RP server (#7807)" (#7810)
This reverts commit 6b34cbe5ed.
2018-12-11 01:59:21 -08:00
izzyinboxandkevinz000 6b34cbe5ed doubles the max say/emote size to match the RP server (#7807) 2018-12-11 01:53:43 -08:00
kevinz000andGitHub 552a9622c7 Update human.dm 2018-12-11 01:09:03 -08:00
deathride58andGitHub 3775ba4c3a Merge pull request #7789 from Citadel-Station-13/kevinz000-patch-17
Obfuscates the map vote (only during the voting period)
2018-12-10 19:27:40 -05:00
deathride58andGitHub abdf3b2cd9 Merge pull request #7800 from Citadel-Station-13/kevinz000-patch-19
xeno tackles now hardstun for 3 seconds if someone is not lying down
2018-12-10 19:26:58 -05:00
deathride58andGitHub 87f10ae5c5 Merge pull request #7801 from Citadel-Station-13/kevinz000-patch-20
xenomorph neurotoxin now always hard stuns for 3 seconds, and do 25 stamina because honestly the stamina rework destroyed a major antagonist and it is sad
2018-12-10 19:25:52 -05:00
nik707andGitHub f4c022d076 Merge pull request #7795 from Trilbyspaceclone/patch-21
Syndicate bombs (The drink) can now spawn in snack vests
2018-12-10 16:55:06 -06:00
nik707andGitHub cae30f90ad Merge pull request #7799 from R3dtail/new_carpet
Added Another new carpet, and two tables, a new cargo crate, and two new medals.
2018-12-10 16:45:38 -06:00
nik707andGitHub 1960947d25 Merge pull request #7803 from Trilbyspaceclone/patch-23
Adds in white crayons to art crate.
2018-12-10 16:44:25 -06:00
nik707andGitHub 971ba21931 Merge pull request #7802 from Citadel-Station-13/kevinz000-patch-21
the one item designed to hard counter kudzu no longer takes 1/2 of your stamina bar to take down one block of fireproofing kudzu
2018-12-10 16:43:03 -06:00
TrilbyspacecloneandGitHub 170a843288 recheck 2018-12-09 19:20:02 -05:00
TrilbyspacecloneandGitHub 63ad6f1175 Update vent_clog.dm 2018-12-09 15:15:23 -05:00
TrilbyspacecloneandGitHub bcfccda986 Update all_nodes.dme.dm 2018-12-09 15:04:47 -05:00
TrilbyspacecloneandGitHub 6481b27cbe Update all_nodes.dme.dm 2018-12-09 15:04:13 -05:00
TrilbyspacecloneandGitHub a58da4c1c8 Update all_nodes.dme.dm 2018-12-09 14:09:04 -05:00
TrilbyspacecloneandGitHub 3e736dcdf2 adds in white crayons 2018-12-08 17:19:13 -05:00
Redtail 4c7075f1a8 New medals added.
add:  Two new medals for engineering and medical to give out.
2018-12-08 12:12:36 -06:00
kevinz000andGitHub d049ecaecd Update hydroitemdefines.dm 2018-12-08 04:53:02 -08:00
kevinz000andGitHub a347cd14e2 eh 2018-12-08 04:19:41 -08:00
kevinz000andGitHub 7978daa370 oopsies woopsies i made a fucky wucky 2018-12-08 04:18:57 -08:00
kevinz000andGitHub a2f9135951 Update hydroitemdefines.dm 2018-12-08 04:16:04 -08:00
kevinz000andGitHub 6ba2d56435 Update neurotoxin.dm 2018-12-08 04:14:36 -08:00
kevinz000andGitHub f250d6ef94 Update human_defense.dm 2018-12-08 04:13:16 -08:00
Redtail 629189fdc1 Added Another new carpet, and two tables, and a new cargo crate.
Added:  monochrome.  Two new table sprites for the other new carpet.  New cargo supply crate for the two new carpets.  Changed:   the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
2018-12-07 22:48:46 -06:00
Ragolutionandkevinz000 1a2a8ec6ae Citadel: The Forgotten Sweaters (#7786)
Wakes up the sleeping Sweaters hidden in turtlenecks.dm
2018-12-06 20:57:48 -08:00
TrilbyspacecloneandGitHub c9a4a08183 Merge pull request #4 from Trilbyspaceclone/lol
Makes the glass
2018-12-06 19:27:15 -05:00
TrilbyspacecloneandGitHub 4ad2b4d070 Makes the glass 2018-12-06 19:26:37 -05:00
TrilbyspacecloneandGitHub 964f2f75d3 triv rethink 2018-12-06 18:39:01 -05:00
TrilbyspacecloneandGitHub 5f3d9cfa7e syndicate bombs can now spawn in snack vests 2018-12-06 18:24:46 -05:00