cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,212 Commits 61 Branches 14 Tags
ee3ce06a506dfd0ffec8eabfc4d4b4379b012b44
Commit Graph

7403 Commits

Author SHA1 Message Date
oranges
ddaeb722ca Merge pull request #18810 from coiax/vital-changes 
Butterflies and cats
 2016-06-23 15:07:06 +12:00
Joan Lung
e6efbdf88f Cogscarab storage is no longer painted cardboard (#18821) 2016-06-22 18:48:36 -05:00
Jack Edge
5f9553163c Butterflies and cats 
- Butterflies now "flutter" rather than say
- Admins have gained Admin->Secrets->Fun->Mass Purrbation
- Plus new cat sound effect.
 2016-06-23 00:37:15 +01:00
oranges
81da43bdc5 Merge pull request #18790 from tgstation/RemieRichards-disappointed 
Venus human trap changes
 2016-06-23 10:05:39 +12:00
Cheridan
dbf467136f Merge pull request #18830 from MMMiracles/a_skele-ton 
Fixes Invisible Skeletons
 2016-06-21 23:10:56 -05:00
oranges
4bc99d1b2e Merge pull request #18798 from Niknakflak/AngelAI 
Adds the Angel AI Core sprite to the game
 2016-06-22 15:50:37 +12:00
MMMiracles
d3e183a4d4 do the skeleton 2016-06-21 22:55:11 -04:00
Joan Lung
44875e7fd4 Fixes holoparasites spamming messages while taking negative damage (#18774) 2016-06-21 10:57:07 -05:00
Cheridan
8003b631ac Merge pull request #18761 from ChangelingRain/alloygain 
Scarab proselytizers reap more alloy from metal and plasteel and can now reap alloy from rods directly
 2016-06-21 10:09:43 -05:00
oranges
269ccc3cf0 Merge pull request #18743 from ChangelingRain/fcrnxvagurgbathrbsgurtbqf 
Non-servant humans can't understand clockwork mobs
 2016-06-21 20:35:24 +12:00
oranges
3a7eab6e05 Merge pull request #18729 from coiax/remove-spawn-3 
Remove spawn III
 2016-06-21 20:11:08 +12:00
NikNakFlak
1f1d87c2e3 Angel AI 2016-06-20 22:19:11 -07:00
Cheridan
0287abf2dc Borgs now get less confused over time! 2016-06-20 23:55:13 -05:00
Remie Richards
13429cf1d4 user -> src 2016-06-21 01:27:13 +01:00
Remie Richards
c2218f9dd7 break -> continue 2016-06-21 01:22:13 +01:00
Remie Richards
3eed211d91 Venus human trap changes 
* Venus human traps now obey the laws of physics when it comes to finding targets
* Venus human traps will continue to grab hold of you even if you're through a wall SO LONG AS YOU WERE ORIGINALLY A VALID TARGET (headcannon: it can still feel you and grasp hold of you with it's vine)
 2016-06-21 01:18:53 +01:00
Joan Lung
41eee01d09 \n 2016-06-20 20:15:29 -04:00
Joan Lung
f3043b3386 Cogscarabs have the proper dead icon (#18759) 
* Cogscarabs have the proper dead icon

* replace deconflict
 2016-06-20 15:55:36 -05:00
Joan Lung
971df0d8de info 2016-06-20 10:36:01 -04:00
Kyle Spier-Swenson
0d6bbbb412 stop the pills (#18703) 
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
 2016-06-20 12:07:44 +02:00
oranges
72371fcdc7 Merge pull request #18693 from Core0verload/list_overhead 
Reduces list init overhead a tiny bit
 2016-06-20 10:59:48 +12:00
oranges
d6bdeb7124 Merge pull request #18455 from Incoming5643/no_bones_about_it 
Mutantrace specflag omnibus
 2016-06-20 08:15:34 +12:00
Joan Lung
321d7ce4be Non-servant humans can't understand clockwork mobs 2016-06-19 15:46:36 -04:00
unknown
f052ce679b Fixed compile error 2016-06-19 15:13:16 -04:00
unknown
4b396a52e7 Resolved conflicts 2016-06-19 15:07:36 -04:00
Joan Lung
b941a47a60 Adds cogscarabs to clock cult (#18685) 
* Adds cogscarabs to clock cult

* playstyle string

* info

* oh good going

* no static

* delay it eating all the metal

* scarab removal service

* cog

* ree

* error handling

* todo: languages = RATVAR

* isclockmob

* very large box

* faintly glowing eyes
 2016-06-19 17:26:35 +02:00
Jack Edge
821b3bc1b3 More spawn removal 2016-06-19 01:50:58 +01:00
Incoming5643
6ad190d867 Spotcheck 2016-06-18 19:53:30 -04:00
Incoming
e33dd6dc70 Merge branch 'master' of https://github.com/tgstation/-tg-station into no_bones_about_it 
# Conflicts:
#	icons/mob/actions.dmi
 2016-06-18 18:57:17 -04:00
Incoming
64c829bd1f Fixes poited out errors and spelling mistakes 
the floral suppository now mutates pod people
adds a proper icon for limb regeneration
slime people can't consume their own head
 2016-06-18 18:42:39 -04:00
Cheridan
9c59db6cd0 Merge pull request #18659 from MrStonedOne/patch-217 
fixes ghost vv.
 2016-06-18 11:30:48 -05:00
unknown
b12398e9fc Resolved conflicts. 2016-06-18 12:17:00 -04:00
Cheridan
caf6352581 Merge pull request #18675 from coiax/plz-no-i-have-a-drone-family 
Drones have the silicon faction by default
 2016-06-18 11:09:32 -05:00
oranges
24eb2c81ac Merge pull request #18690 from KorPhaeron/fulton_patch 
[s]Missing return added to fultons
 2016-06-18 14:43:12 +12:00
c0
0abc91c59d slot_equipment_priority no longer contributes to list init overhead 2016-06-18 05:09:15 +03:00
c0
1311fb9b43 Reduces list overhead a tiny bit 2016-06-18 04:38:49 +03:00
KorPhaeron
c082b7df5a Missing return added to fultons 2016-06-17 19:08:41 -05:00
oranges
0568b8ebce Merge pull request #18636 from coiax/fix-18630 
Drones can hear robotic talk
 2016-06-18 10:57:55 +12:00
unknown
706988154b Resolved conflicts 2016-06-17 18:56:51 -04:00
Razharas
4d9d643db7 Merge pull request #18642 from ChangelingRain/holobuff 
Changes holoparasite balance
 2016-06-18 00:51:09 +03:00
Jack Edge
7c28194f66 Drones have the silicon faction by default 
🆑
rscdel: AI turrets no longer fire at drones.
/🆑

- Also cleaned up some stuff in portable_turret.dm while I was there
 2016-06-17 15:40:27 +01:00
Joan Lung
a6482c76b2 i'm moving all the levers 2016-06-17 06:54:09 -04:00
Kyle Spier-Swenson
b28b4b8237 State department has censored this commit 2016-06-17 01:53:04 -07:00
Kyle Spier-Swenson
658fe55f57 icon state too. 2016-06-17 01:52:32 -07:00
Kyle Spier-Swenson
2beafae7e0 Should call the parent too, incase that ever matters. 2016-06-17 01:47:02 -07:00
Kyle Spier-Swenson
f2b16cd17d Redpills ghost vv. 
Fixes being unable to edit icon or fun_verbs in vv on ghosts.
 2016-06-17 01:45:57 -07:00
Xhuis
df08005b60 Two fixes 2016-06-17 00:13:17 -04:00
Xhuis
75d9e4174f [s] Lavaland Patch (#18398) 
* Commit squash before update to master

* Removed repathing and slot machine shenanigans

* Legion spawn changes

* Map edits, round II

* Some changes

* Removes map changes, hopefully

* Conflicts 1

* Updates the maps

* Conflicts 2

* How about now?

* Remaps the colossus arena

* Restores old colossus spawning
 2016-06-16 22:00:09 -05:00
Militaires
76c4bcc0ea xenomorph maid reskin for byond members (#18545) 
Adds a new sprite that byond members can access when being the xenomorph queen
 2016-06-17 13:32:08 +12:00
unknown
f33a7efbf7 Resolved conflicts. 2016-06-16 19:10:07 -04:00