Commit Graph

7752 Commits

Author SHA1 Message Date
Cheridan 5304510121 Merge pull request #20303 from ChangelingRain/shootmedownofcourseimthesinfuloneherebutnowivefoundareasontofeelnofear
Bubblegum's charge now goes the full distance to the target
2016-09-04 13:38:25 -05:00
MMMiracles 1b4318f1a2 Combat Bears (#20215)
* adds bear

* bear armor dlc

* bear upgrades galore
2016-09-04 09:51:03 +12:00
oranges ebcde4fe56 Merge pull request #20290 from ChangelingRain/feetdeepintheeartharmsdeepinthedusthandsonthemountainseyesinthesea
Fixes some potential weird faction bugs
2016-09-04 09:47:37 +12:00
oranges c34bcaa9ad Merge pull request #20264 from GunHog/Silicon_Ghost_Laws
Ghosts may now examine silicons to read their laws.
2016-09-04 09:45:33 +12:00
Joan Lung 42acfb5571 range 2016-09-03 16:06:04 -04:00
Joan Lung c4ffc23499 rip position 2016-09-03 16:04:37 -04:00
Joan Lung 4813791163 non-random 2016-09-03 14:56:53 -04:00
Joan Lung 950851b5a7 it's comin at ya 2016-09-03 14:34:42 -04:00
Joan Lung 246c6cf5d6 'insert horrifying roar here' 2016-09-03 14:30:32 -04:00
Joan Lung 266bacf4c8 Bubblegum now charges past its target's location 2016-09-03 12:09:08 -04:00
AndrewJacksonThe2nd 8298331538 fixes 2016-09-02 15:57:15 -07:00
AndrewJacksonThe2nd 082b4e4821 Merge branch 'master' of https://github.com/tgstation/-tg-station into goofmos
Conflicts:
	code/game/turfs/open.dm
	code/modules/mob/living/living_defines.dm
2016-09-02 15:51:26 -07:00
Joan Lung 32ef285db9 Merge pull request #20272 from Iamgoofball/patch-122
Hacky freon fixes pending the rework
2016-09-02 18:46:15 -04:00
AndrewJacksonThe2nd 0ada3764ae Merge branch 'master' of https://github.com/tgstation/-tg-station into goofmos
Conflicts:
	tgui/assets/tgui.js
2016-09-02 15:42:17 -07:00
Joan Lung 0f3031bd7e Fixes some potential weird faction bugs 2016-09-02 16:51:26 -04:00
A-t48 91bbdfee56 Fixed cyborgs being able to use Power Warning emote when broken. (#20249)
* Fix #19905

* Slight cleanup
2016-09-02 20:14:15 +12:00
Iamgoofball bd1bb7c22a Update living_defines.dm 2016-09-01 18:06:47 -07:00
Iamgoofball b777e451ef Update living.dm 2016-09-01 18:06:15 -07:00
GunHog ad66c15ac7 Ghosts may now examine silicons to read their laws!
- Examining an AI or Cyborg as a ghost now displays its laws.
2016-09-01 13:55:06 -05:00
AndrewJacksonThe2nd f405ed6603 GOOFMOS: FREON REWORK and WATER VAPOR 2016-08-30 23:25:32 -07:00
Incoming5643 540fa28339 Quality of life pull for my recent commits (#20210)
* Quality of life pull for my recent commits:

RPGloot will no longer try to place scrolls in secret satchels, as this would slowly turn the drop table into these fairly useless joke items.

Goes through and genders most(all) the pets in the game so the gender change potion can work on them. Many previously hard defined generic animals can now be either male or female.

* Secret satchel is now a bit more aggressive with making sure a satchel is placed

D E F I N E S

* "quality"

* Not Canon
2016-08-31 09:23:54 +12:00
Iamgoofball 634662d6b4 Adds Freon to the game (#20188)
* Adds Freon to the game

* MAP CHANGE MEMES

* hahahahafuck

* YOU SAW NNOTHING

* fuqq

* sd

* Fixes

* Fixes2

* fixes

* BALANCE

* mob icecubing ALSO FUCK YOUR STATUS EFFECT CODE @Xhuis

* i play pokemon go every day

* Reworks icecubing

* sjyuhdjzsadjhm x jymhuxzc

* Final Pass

* kmJCBQADVNWVBOJRFJN

* changes

* nnjhdxsjhjh
2016-08-31 08:58:55 +12:00
oranges ea90c161a0 Normalizes the ed209 to match portaturret fire time (#20200) 2016-08-29 22:03:19 -05:00
Razharas a731d27c64 Merge pull request #20169 from ChangelingRain/babeyourwordsdonotaffectmeidontcarewhatyouthinkishouldbe
Makes lavaland more atmospheric
2016-08-29 21:18:46 +03:00
oranges c11b9509d2 Merge pull request #20160 from ChangelingRain/goandlovemegoandhatemegoandcrybutyoucantchangeme
Simple animals with force thresholds now properly handle damage_coeff
2016-08-29 21:00:42 +12:00
Joan Lung 9ea303705a fancy 2016-08-28 09:14:22 -04:00
Joan Lung bfb6fa9c16 Makes lavaland more atmospheric 2016-08-27 23:55:33 -04:00
oranges 3badbcc9ec Merge pull request #20115 from Shadowlight213/whydoestheaihavetogointhecoreitcouldgoonthetable
A few tweaks and improvements to silicons.
2016-08-28 12:58:15 +12:00
oranges 0c95041d5b Merge pull request #20106 from Shadowlight213/interactfixes
Tweaks to admin ai interact
2016-08-28 12:38:39 +12:00
Incoming5643 09683bac79 adds the gender change potion as the blood reaction of pink slimes (pink slimes previously only had one reaction, and it's not exactly a barnburner). (#20149)
This item changes up the gender var of any gendered mob/living. Including people. There are a few interesting applications of this item, mostly if your into animal husbandry (all generic animals unless programed otherwise are all the same gender) but mostly it's just here to fill the immensely niche gap the loss of gender reassignment surgery left. Also it's 2:30 am.

Also factors out the old human var gender_ambiguous, as that surgery was the only way to ever trigger it.
2016-08-27 19:29:20 -05:00
Joan Lung 8637607c5e Simple animals with force thresholds now properly handle damage_coeff 2016-08-27 18:53:18 -04:00
pubby 6f11a12e13 Replaces standard borg sheet snatcher with mining scanner. (#20111) 2016-08-27 16:56:28 -05:00
Core0verload 3b188fd41f One Liner Fix (#20098) 2016-08-27 10:34:22 -05:00
Jordie f9c3492e6e Merge pull request #20103 from Shadowlight213/radstormfixes
A couple of radstorm fixes.
2016-08-27 13:47:49 +10:00
Shadowlight213 3ff6886189 Fixes infinite stun and collapse spam 2016-08-25 21:58:23 -07:00
PKPenguin321 11a500d3b7 makes people get hurt when thrown at each other (#20084)
* makes people get hurt when thrown at each other

* why the space indeed
2016-08-26 14:12:06 +12:00
Joan Lung 5188bc7a69 Fixes AI bumping (#20077) 2016-08-26 14:11:20 +12:00
Shadowlight213 01f2343b41 A bunch of tweaks and improvements to silicons 2016-08-25 15:47:42 -07:00
Incoming5643 1993b8d7ca [s] Adds the top secret room to centcom (#20071)
* Adds the top secret room to centcom, the final destination of players who manage to cosign themselves to nullspace.

Said room is an homage to a room that served a similar purpose in the legend of zelda.

* Follow up issues pull:
for loop optimization
game logging
spelling errors

* more info for admin message
2016-08-26 08:46:52 +12:00
Shadowlight213 e88d474fc0 Improves the handling of unlimited silicon privileges for admin ai interact a bit. 2016-08-25 12:58:00 -07:00
Cheridan 5defa30696 Merge pull request #20062 from ChangelingRain/takepainstohurtnobodywhereyoucanwhereyourmerepresenceisapainleavewhereyourwordsaredaggerscloseyourmouthwhereyoursightisarakinglashcloseyoureyes
Adds several KA mods and allows mining borgs to install any KA mods
2016-08-24 13:26:54 -05:00
Joan Lung 8667275dd9 Merge pull request #20052 from PKPenguin321/alien-queen-giga-toggle
[READY!] Adds alien queen sprite toggle
2016-08-23 23:01:15 -04:00
PKPenguin321 11b06f1b09 hopefully final commit 2016-08-23 17:01:24 -07:00
PKPenguin321 bcc030be17 finally makes the button work 2016-08-23 16:10:39 -07:00
Joan Lung 54c1d0ef35 MODS MODS MODS GET EM NOW 2016-08-23 15:26:19 -04:00
oranges 03317708ec Merge pull request #20024 from Shadowlight213/enoughisenoughistoomuch
Makes runtime's family persistence only work on kittens
2016-08-23 17:22:40 +12:00
PKPenguin321 7234a84ba7 bjkajkjbks 2016-08-22 19:10:01 -07:00
PKPenguin321 9413a55511 aaaaaaa 2016-08-22 18:30:14 -07:00
PKPenguin321 8182f558fe fixes
- makes the background of the button the right color
- fixes the runtime (but the button still doesnt work properly)
2016-08-22 17:58:24 -07:00
PKPenguin321 de16b9a1cc adds alien queen sprite toggle 2016-08-22 17:35:04 -07:00