cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,775 Commits 61 Branches 14 Tags
598daee493cdb6c2aa89f53bb3b476f2b4e6fd14
Commit Graph

2096 Commits

Author SHA1 Message Date
oranges
829243360d Merge pull request #18489 from Core0verload/ce_jetpack 
Brings back CE's hardsuit jetpack
 2016-06-15 10:44:59 +12:00
Joan Lung
8582d0fbbd Chairs now handle layer updates/rotation with setDir 2016-06-12 22:56:41 -04:00
oranges
d7c748a558 Merge pull request #18472 from phil235/HackyShit 
Fixes Synths
 2016-06-13 09:24:52 +12:00
oranges
99620ffe76 Merge pull request #18481 from phil235/PlantsGunsShit 
Moving code around
 2016-06-13 00:14:29 +12:00
c0
b615fb504f Brings back CE's hardsuit jetpack 2016-06-12 09:18:39 +03:00
Remie Richards
b3b60b187b Manual repair of some edge cases. 2016-06-11 23:11:54 +01:00
phil235
3b8af6f5ff Fixes grille/New() not calling ..() 
Blood drips icons are now in blood.dmi instead of drip.dmi (which only had the 5 drip sprites).
Moved projectiles, guns, casings and ammo boxes to be in the right files. Please don't put your gun with its projectile, ammo casing and ammo box all the same file.
I split growing.dmi into 5 smaller files so we don't get close to the 512 icon limit again. Each seed has a var to indicate which icon file to use when planted.
Fixes code for heavy pulse laser projectile to be less awful.
 2016-06-11 23:18:26 +02:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
phil235
9e5e525335 Fixes admantine golem female body icon. Now all golems have a female version. 
The wizard can no longer choose to become a military synth.
 2016-06-11 17:13:12 +02:00
Joan Lung
4b9c4c7adb Merge pull request #18394 from lzimann/stools2 
Bar stool no longer becomes a normal stool and are now constructables
 2016-06-09 22:01:19 -04:00
Lzimann
9a9fd0a06a I fucked up 2016-06-08 22:36:04 -03:00
Joan Lung
4f8133c3d1 unfucks ratvar conversion 2016-06-08 15:50:06 -04:00
oranges
c5a84c769d Merge pull request #18036 from AnturK/init_meme 
Defers some list initializations
 2016-06-08 19:20:04 +12:00
Leo
cf27511dc9 Bar stool FIGHTS (#18325) 2016-06-08 13:29:47 +12:00
AnturK
19eb97ae18 Moves some list initializations to New 
Fixes missing ..() calls in New()
 2016-06-07 18:39:13 +02:00
oranges
2aba5f48ef Merge pull request #18263 from pudl/big-daddy-thicc-dick 
Adds bar stools
 2016-06-07 12:59:34 +12:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor 
Blood refactor stuff
 2016-06-07 10:09:35 +12:00
phil235
94a5d5bfad Atom movable that are neither /mob nor /obj should not be picked by the closet insertion proc. (#18244) 2016-06-05 12:48:19 -05:00
phil235
40a371296a Adding lizard blood pack in medbay storage's freezer crate. 
Added a var/exotic_bloodtype to species, instead of hardcoding a lizard type.
Fixes proc for objects who should never be bloodied.
 2016-06-05 18:12:08 +02:00
oranges
69bd3575e3 Merge pull request #18228 from ChangelingRain/swordofRATVAR 
Additional Ratvar conversion effects and related changes
 2016-06-06 01:35:26 +12:00
oranges
c09046e3f1 Merge pull request #18201 from PKPenguin321/cmo-implanter 
Refines autoimplanter code, gives CMO single use autoimplanter for HUD augment
 2016-06-06 01:25:52 +12:00
oranges
050c42ff5e Merge pull request #18174 from coiax/holodeck-cold 
Adds two new holodeck levels
 2016-06-06 01:23:43 +12:00
pudl
a76f6748bd adds stupid shitty bar stools 2016-06-04 19:06:52 -05:00
phil235
bd20c313b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor 
Conflicts:
	code/__DEFINES/genetics.dm
	code/modules/mob/living/carbon/human/species_types.dm
 2016-06-04 17:41:43 +02:00
phil235
b482764a19 - I made human/handle_blood() less shitty. 
- We no longer leave a blood trail if blood_volume is below a certain level which depends on the brute damage received. This way dragging a wounded player does have a bad effect.
- We no longer give humans a second reagents var containing blood, and we don't put exotic blood in the mob's reagents. Now we don't store any blood substance inside the mob, we only have a blood_volume var. When we draw blood with syringe we create the reagent that match the type (blood reagent, or an exotic blood reagent)
- can't draw blood from mob if it's low on blood, so we can't empty a mob of its blood entirely.
- Removed the blood type preference appearing in character setting.
- blood pack automatically show blood type, unless manually labeled.
- removed bloody_hands_mob human var and same name glove var.
- Some animals now have blood (pets, goat, cows)
- hitting and dragging mobs with actual blood in their veins leaves blood on you and a trail on the floor.
- probably other stuff that I'll mention in the PR.
 2016-06-04 17:33:16 +02:00
Nerd Lord
c51b1503ac clockwork windoors 2016-06-04 10:27:27 -04:00
Nerd Lord
3793e6187a Addition Ratvar conversion effects and related changes 2016-06-03 23:19:13 -04:00
Xhuis
2b18993b04 Conflicts II 2016-06-03 15:42:19 -04:00
Xhuis
70795389df More stuff, no conflict fix yet 2016-06-03 15:07:49 -04:00
Jordie
4c8f8ae53e Merge pull request #18154 from PKPenguin321/plant-analyzer-repath 
Repaths plant analyzers
 2016-06-03 16:41:02 +10:00
PKPenguin321
01281044a1 refines autoimplanter code, replaces CMO eye HUD augment in locker with single use eye HUD augment autoimplanter 2016-06-02 23:23:52 -07:00
Xhuis
685d938481 Some more work or something, idk 2016-06-02 20:53:51 -04:00
oranges
5c3c84dad8 Merge pull request #18137 from ChangelingRain/airblocked 
False walls now block air
 2016-06-03 09:29:08 +12:00
Razharas
9fdae2fe4e Merge pull request #17576 from LatD/Research 
[Ready for test/merge] R&D level remake
 2016-06-02 18:41:43 +03:00
Jack Edge
546bb633cd Adds two new holodeck levels 
- Winter Wonderland
Apparently no one paid for christmas decorations, and it's
incredibly cold and low pressure. But it's a good counter
to a burn mix.

- Anthophila
"A simulation of a bee colony? Why is this in the restricted
section?" - Victim of the holodeck bee massacre
 2016-06-02 16:34:41 +01:00
PKPenguin321
cf71a5833f repaths plant analyzers 
so they are no longer children of regular analyzers
 2016-06-01 22:44:03 -07:00
Nerd Lord
5d91f7c0ea fix! 2016-06-01 20:17:48 -04:00
Nerd Lord
3068603350 False walls now block air 2016-06-01 16:29:38 -04:00
Cheridan
9b8c68e704 Merge pull request #18065 from coiax/blood-box 
Adds "blood freezer" to map; replaces freezer of blood packs
 2016-06-01 00:51:52 -05:00
oranges
b654016574 Merge pull request #17936 from MMMiracles/ruin_stuff 
Adds some spawnable shuttle templates for admin memery
 2016-05-31 15:58:12 +12:00
Jack Edge
37acbe9990 Adds "blood freezer", adds to map 
No actual changes to the maps themselves, just moving
the bloodpack spawns from map into code.
 2016-05-31 00:49:42 +01:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
xxalpha
0d608250fa Changed AI core programming so it functions like the AI Upload. (#18004) 2016-05-30 10:54:50 +12:00
Joan Lung
325d8aa807 Merge pull request #17954 from GunHog/Head_Megaphones_100_Percent_Meme_Free 
Head Megaphones + Megaphone changes
 2016-05-28 10:40:31 -04:00
LatD
65a0027979 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-28 01:37:55 +03:00
Shadowlight213
ce01058e7c Fixes merge conflicts 2016-05-27 15:36:56 -07:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949) 
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
 2016-05-27 22:16:21 +02:00
Cheridan
27825e6584 Merge pull request #17930 from ChangelingRain/tabling 
Fixes glass tables not producing debris when broken
 2016-05-27 15:03:35 -05:00
Cheridan
d5a95e093b Merge pull request #17896 from phil235/PullvsGrab 
Merges Pull and Grab into a single functionality.
 2016-05-26 15:51:46 -05:00
GunHog
70380bc0d5 Head Megaphones 
Adds megaphones to CE, CMO, and RD lockers.
 2016-05-26 14:24:17 -05:00