cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-05 22:43:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,542 Commits 60 Branches 14 Tags
ace673e829f66a8a766aee2a641dc2a9f88eae87
Commit Graph

2338 Commits

Author SHA1 Message Date
oranges
16b3ac6e03 Merge pull request #21942 from Firecage/Suitsensorsbegone 
Ash Walkers now has a uniform without suit sensors.
 2016-12-06 10:40:03 +13:00
Cheridan
d402f7620c Merge pull request #21919 from ChangelingRain/tileproselytizing 
You can now proselytize floor tiles
 2016-12-04 20:20:18 -06:00
Firecage
bd152f6857 Ash Walkers now has a uniform without suit sensors. 2016-12-04 17:06:03 +02:00
Mervill
3f68bd7202 Merge branch 'master' into a_intent 
Conflicts:
	code/modules/mob/mob_defines.dm
 2016-12-04 00:38:37 -08:00
Joan Lung
12aa57fd7e You can now proselytize floor tiles 2016-12-03 17:03:29 -05:00
Mervill
481cc07dcf m_intent now uses defines 2016-12-03 00:25:44 -08:00
Mervill
0972f78800 a_intent now uses defines 2016-12-02 22:27:30 -08:00
Mervill
c2e2440953 Merge branch 'master' into w_class 
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
 2016-12-02 21:44:24 -08:00
Jordie
ca6ffdba40 Merge pull request #21866 from Mervill/slashes_deux 
Remove slash from end of type refs/defs
 2016-12-03 15:56:10 +11:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Joan Lung
a5ae025549 Replaces "specflags" with "species_traits" (#21851) 
* Replaces "specflags" with "species_traits"

* this will do
 2016-12-01 21:16:33 +13:00
Mervill
01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
oranges
7b53791a1d Merge pull request #21799 from bgobandit/fixingmyshit 
Fixes urinals.
 2016-11-29 17:14:15 +13:00
XDTM
23906c811a Adds more golem types, adds golem shell creation with adamantine slimes (#21708) 
* Diversifies golems

* Golems

* fixes a bug

* Glass golem + species bullet_act support

* Glass shatter

* More golems

* Final changes

* Added to xenobio

* update

* minor space

* Totally bananas

* silly me

* what Joan said

* Updated titanium, plastitanium, and alloy golems.
 2016-11-28 18:34:08 +13:00
bgobandit
468d900ef7 Fixes urinals 2016-11-27 16:39:39 -05:00
Jordie
d5bff39b71 Merge pull request #21786 from optimumtact/litanyoffailures 
Fixes all remaining addtimers missed
 2016-11-27 21:47:44 +11:00
Xhuis
ed11869a79 Gives cyborgs the ability to open morgue trays (#21747) 
* Gives cyborgs the ability to open morgue trays

* Small balance changes
 2016-11-27 23:07:40 +13:00
Xhuis
118fca35b8 Cleanup on aisle 892 (#21745) 
* Plastic explosives now delete upon suicide

* Removes some old code

* Allows resisting out of straight jackets

* Verifies roller bed dock functionality

* Fixes lava's article

* Fixes Syndicate pinpointers being stuck to one mode

* Addresses some of @phil235's concerns

* Removes the Highlander left standing message
 2016-11-27 22:59:34 +13:00
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
Cyberboss
a592e68f87 Viewers always returns a list (#21676) 2016-11-22 17:23:40 -05:00
oranges
49d307ee20 Merge pull request #21601 from RandomMarine/justmorguethings 
Adds in-game explanation of the morgue lights
 2016-11-19 13:40:36 +13:00
Cyberboss
f2808303ee Tweaks to the snakebox (#21530) 
* The word snake makes no sense to me now

* Fixes volume

* Fixes spam

* Extra memes

* incap check

* Compile before commit

* Roast me Travis

* ... And moved

* Timing changeling

* Cheri has spoken
 2016-11-19 13:36:07 +13:00
RandomMarine
40b666f6cb adds morgue instructions 2016-11-17 01:47:27 -08:00
ExcessiveUseOfCobblestone
f01862c208 hotfixes icons for HoG fluff-structures (#21556) 
WHO DID THIS
 2016-11-15 11:15:37 -06:00
oranges
d11bb7258a Merge pull request #21529 from Cyberboss/DoTheTruffleShuffle 
Storage rustling cleanup/refactor
 2016-11-15 16:39:30 +13:00
kevinz000
6581ae2b49 [READY]Slightly buffs Peacekeeper Cyborg Energy Barriers (#21513) 
* Update holosign_creator.dm

* Update holosign.dm

* Update holosign.dm

* Update holosign_creator.dm
 2016-11-14 19:10:30 +13:00
Joan Lung
de1c7b074a Servants of Ratvar can now unsecure and move most Clockwork Structures (#21485) 
* Servants of Ratvar can now unsecure and move Clockwork Structures

* anchoring required

* gen

* bleh

* check again

* no stacking wardens, kay?

* alright!

* that too

* smart

* round

* as is done

* hmm

* less effective
 2016-11-14 12:47:31 +13:00
Cyberboss
316070be13 Wooweee feeling rustled today 2016-11-13 12:07:04 -05:00
Mysak0CZ
87211b3e3d [ready for review]Minor locker tweaks (#21494) 
* you can anchor lockers using wrench, minor tweaks

* AIs and Cyborgs procs addition

* Spelling update

* Removed silicon remote control
 2016-11-13 17:14:14 +13:00
KorPhaeron
44e3733e64 Bedsheets now go in the neck slot 2016-11-10 02:12:54 -06:00
KorPhaeron
629bfb6c5e Cloaks are now cosmetic neck slot items (#21418) 
* Cloaks are now cosmetic neck slot items

* Re-orders layers so bags will display above cloaks
 2016-11-10 09:30:25 +13:00
duncathan salt
076d256a47 small atmos changes to transit tubes (#21411) 
* small atmos changes to transit tubes, part 1

* small atmod changes to transit tubes, part 2

* Fully remove redundant proc
 2016-11-09 10:07:25 +01:00
Joan Lung
0c82fb0770 Merge pull request #21368 from phil235/fixbundleshit 
Easy fix bundle
 2016-11-05 19:41:27 -04:00
Joan Lung
241e6e75b8 Merge pull request #21359 from phil235/WindowExplosionBlockFix 
reinforced window and telehulk bugfixes
 2016-11-05 19:33:15 -04:00
Cheridan
3dd35cc0b1 Merge pull request #21365 from ChangelingRain/glowfixes 
You can now proselytize false walls + glow fixes
 2016-11-05 18:30:59 -05:00
Cheridan
6a885d9500 Merge pull request #21342 from phil235/TransitShit 
Fixes transit tubes
 2016-11-05 17:21:24 -05:00
phil235
b8e5bb22bc Moves bodybag closet into the closet folder where they should be. 
Fixes large crate, critter crate, cardboard and metal boxes showing a nonfitting sprite when wrapped. I added two new sprite for those wrapped box-like closet, one for wrapped and one for giftwrapped.

You can now use tabs when writing on paper, by using "[tab]".

Fixes clone damage not being transfered when humanizing/monkeyizing with a dna injector.

Fixes chaplain's camera obscura showing invisible things other than ghosts.

Fixes typo in carbon/examine.dm().
 2016-11-05 00:00:28 +01:00
Joan Lung
990942481f You can now proselytize false walls + glow fixes 2016-11-04 11:53:48 -04:00
Joan Lung
d4643f032c Proselytizer conversion now accounts for existing materials better (#21334) 
* Proselytizer conversion now accounts for existing materials better

* shitfuck.

* move the god damn defines
 2016-11-04 15:35:00 +01:00
phil235
8cb3736221 Fixes turf having two contents_explosion() 
Fixes hulk plus telekinesis being able to hulk smash things from a distance.
 2016-11-04 00:33:51 +01:00
phil235
48af5e5927 Removed another outdated comment 2016-11-03 19:19:32 +01:00
phil235
b0b5a90bd7 Requested changes 2016-11-03 19:03:04 +01:00
phil235
26b8d03b2f Merge branch 'master' of https://github.com/tgstation/-tg-station into TransitShit 2016-11-02 22:57:51 +01:00
phil235
51d1319ed1 Make transit tube code less shit. 2016-11-02 22:55:36 +01:00
oranges
f57357a049 Merge pull request #21316 from ChangelingRain/unflappable 
Plastic flaps are once again immune to being hit in melee
 2016-11-03 10:11:17 +13:00
Joan Lung
02e54446d8 Hulks no longer oneshot literally every clockwork structure (#21283) 
* Hulks no longer oneshot literally every clockwork structure

* rrrrr

* why the fuck did you ask me to make this a proc????

* hulks, why.
 2016-11-02 22:52:42 +13:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005) 
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
 2016-11-02 16:16:21 +13:00
Cheridan
37c6f1e1ae Merge pull request #21310 from ChangelingRain/gearbits 
Brass windows and windoors no longer drop full sheets of brass when destroyed
 2016-11-01 09:09:51 -05:00
Joan Lung
883e7f745b Plastic flaps are once again immune to being hit in melee 2016-10-31 18:06:33 -04:00
phil235
2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing 
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
 2016-10-31 19:59:00 +01:00