cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 10:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,531 Commits 62 Branches 14 Tags
8cbfed09a5ffd7e10b60f4e73b424eccc5a42a4d
Commit Graph

1490 Commits

Author SHA1 Message Date
xxalpha
3f29a9866c Merge remote-tracking branch 'upstream/master' into qdelFixes 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2015-08-31 08:52:30 +01:00
Cheridan
32d74ad19c Merge pull request #11433 from Core0verload/framed 
Buttons and wall frames rework
 2015-08-30 13:43:19 -05:00
c0
97b792bbc3 Changed some circuits paths to reduce copypasta 2015-08-30 16:58:13 +03:00
Cheridan
d824f7b35f Merge pull request #11382 from Ergovisavi/bot_swarm 
Adds "Swarmers" - Simple mob side antagonist
 2015-08-28 00:21:23 -05:00
Ergovisavi
3737234b9c -Adds swarmer as a language, makes them only able to speak to each other 
-Fixes a few structures/machines taking non brute/burn damage from attack_animal
-Adjusts girders to be a little less resistant to explosions
-Span classes all the swarmer messages, bumps their health up to 40
-Adds ability for swarmers to dismantle machines and disable cameras. Some are obviously protected.
 2015-08-27 22:10:30 -07:00
c0
8474086bce Buttons and wall frames rework 2015-08-28 02:01:49 +03:00
xxalpha
b9db8ce854 A few qdel fixes. 2015-08-27 13:15:41 +01:00
Aranclanos
38e6a09cf9 Merge pull request #11351 from Core0verload/nodirt 
Removes dirt from walking on tiles
 2015-08-26 06:27:31 -03:00
Ergovisavi
9572bd6aa6 -First revision of Swarmer mob, hud, icons, etc 
-Adds functionality of ignored damage types to simple mobs
-Adds functionality of melee damage types to simple mobs
 2015-08-25 03:24:34 -07:00
c0
9cfb246e4f Removes dirt from walking on tiles 2015-08-24 11:33:52 +03:00
Supermichael777
e0c6c710c2 Update barsigns.dm 2015-08-20 20:08:23 -04:00
Supermichael777
6fe5f23e55 Updates dank memes. 
updates Bar memes to reflect recent rule changes/be funny.
 2015-08-20 15:06:42 -04:00
Remie Richards
b70dfb8ece Merge pull request #11189 from phil235/JanicartFixes 
Slipping while buckled, some fixes
 2015-08-18 20:26:36 +01:00
Swag McYolosteinen
6b091e0cb6 Merge pull request #11086 from freerealestate/rcdrebalance 
Rebalances RCD construction costs around metal construction menu costs
 2015-08-14 15:14:25 +02:00
phil235
1cee0d3014 Fixes slipping on water while riding janicart. 
The handle_slip() now also handles cases where the mob is buckled. If you are buckled and slip on lube (or something that ignores

galoshes) you get unbuckled and stunned and the buckle object moves one step (no slides unlike when unbuckled).
You can thus slip on lube while buckled to a chair or a roller bed.
Fixes getting hit by abstract held items when slipping.
Fixes janicart rider getting hit twice by bullets.
Removing the STEP constant var in slipping code, it's no more used.
Fixes carbon/slip() not returning the correct value.
Changed var/obj/structure/stool/bed/buckled to var/obj/buckled since buckled can now technically be any obj.

Removes hacky unbuckling/buckling in bed/Move()
 2015-08-13 23:49:02 +02:00
Swag McYolosteinen
46b519309e Merge pull request #11058 from Core0verload/surgery-organs-part2 
Surgery & Organs rework: Phase 2
 2015-08-13 18:04:16 +02:00
Swag McYolosteinen
2bb4f63023 Merge pull request #11087 from phil235/GirderSinguloPull 
Girder deconstruction bugfix
 2015-08-13 16:33:28 +02:00
WJohn
9104fd7456 Merge pull request #11107 from Core0verload/bedfix 
Fixes #11090
 2015-08-12 19:43:28 -04:00
Remie Richards
eedea4d281 Merge pull request #11018 from Core0verload/hammerspace 
New traitor item: storage implant
 2015-08-12 14:45:23 +01:00
phil235
70a8046081 Merge pull request #10815 from bgobandit/bagtags 
Body bag sprites now update their tag overlay properly.
 2015-08-09 02:18:56 +02:00
c0
1f8a439fb2 Fixes bedsheet-capes sprites. 2015-08-09 01:42:36 +03:00
c0
2e5cedef74 Added alien organs 2015-08-09 01:12:32 +03:00
Jim Boonie
a7b09a84ab - Made costs and delays variables 
- Made plasteel multiplier a variable
- Made shocked grilles shock unprotected RCD users
- Made grilles deconstruct instantly to match wirecutters
- Made RCD unable to deconstruct reinforced floors
- Changed canRwall to canRturf to cover both r walls and floors
- Changed large matter cartridge matter amount to 160 so it can still fit in the RCD
- Added fourth matter cartridge to RCD crate so it once again holds enough cartridges to fully load it
 2015-08-08 21:18:45 +12:00
phil235
866cdbcd34 Fixes plasma cutter firing sound, as well as lack of sound when slicing girder/statues. 
Rearrange girders.dm
Singularity_pull() no longer unanchors anchored objects (because it breaks the deconstruction of table/girder/states/etc, and make mech pullable by mobs), but it still pulls them.
 2015-08-07 23:14:45 +02:00
c0
bd8d70ec26 New traitor item: storage implant 2015-08-04 18:28:38 +03:00
c0
2504affdcf Better sprites for bed and bedsheets 2015-08-04 15:39:28 +03:00
Jordie
d5a88d3f98 Merge pull request #10957 from Core0verload/surgery-organs-implants 
Implants, Surgery and Organs rework: Phase 1
 2015-08-04 21:45:02 +10:00
c0
600d424ea5 Moved cyberimplants to internal organs system 2015-08-02 22:28:45 +03:00
phil235
0e91f254b9 Fixes a warning during compilation. 
Removes some unneeded code lines.
 2015-08-01 19:46:36 +02:00
phil235
3cb8df6e8d Merge pull request #10948 from SvartaSvansen/disintegrating-airlocks 
Fixes disintegrating airlocks.
 2015-08-01 17:24:21 +02:00
SvartaSvansen
e12d47aab6 Centcom airlock assemblies! No more disintegrating airlocks! 2015-07-31 01:41:02 -04:00
phil235
95be17923e Merge branch 'master' of https://github.com/tgstation/-tg-station into DisposalStuff 
Conflicts:
	_maps/map_files/AsteroidStation/Asteroidstation.dmm
 2015-07-30 16:34:39 +02:00
Orange Borg
04e74a4ffd Update girders.dm 2015-07-29 22:29:12 +12:00
Orange Borg
2eb50b644a Fixes small typo in girders.dm 
Prevented borgs building a false wall

Fixes #10874
 2015-07-29 13:22:48 +12:00
phil235
34b9a045fc Fixes non carbon being stunned when thrown and hitting something dense. 
Fixes being able to enter a disposal bin while buckled.
Fixes items bouncing off delivery chute when thrown into it despite entering the chute.
Fixes being able to leave disposal pipes when moving inside pipes on a janicart.
Fixes some potential runtime (null loc) when flushing the disposal units.
Fixes the thrown range when being ejected from a disposal pipe.
 2015-07-26 20:40:46 +02:00
Jordie
f5ae59a046 Merge pull request #10700 from Ergovisavi/more_fire 
Molotovs and a throw fix
 2015-07-25 20:05:05 +10:00
bgobandit
0d9f7dcb4a Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-07-24 11:58:52 -04:00
bgobandit
ab9668dd3d Moves update_icon(). Adds crayons. 2015-07-24 09:38:13 -04:00
bgobandit
2e88de4643 Merge branch 'master' of https://github.com/tgstation/-tg-station into bagtags 2015-07-24 02:17:10 -04:00
bgobandit
3ab197f80f Body bag sprites now update their tag overlay properly. 2015-07-23 20:20:55 -04:00
WJohn
1d48703c0e Merge pull request #10778 from bgobandit/babbysfirstcommitwhoawow 
Fixes some spelling errors and tweaks some fluff text.
 2015-07-23 19:45:47 -04:00
bgobandit
fcb081f0e1 (hopefully) fixes merge conflict, adds changelog entry 2015-07-23 11:22:49 -04:00
bgobandit
df836d0f73 Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug. 2015-07-23 10:49:06 -04:00
Jordie
b2948fcab7 Merge pull request #10659 from phil235/HandcuffOverlayFix 
Handcuff, fire, overlays_standing fixes
 2015-07-23 22:21:52 +10:00
bgobandit
d0eb72fd3a #whoa #wow 2015-07-22 14:58:58 -04:00
phil235
40967044cb Merge pull request #10707 from KorPhaeron/fixes 
Fixes
 2015-07-21 20:46:27 +02:00
KorPhaeron
d1dec3ffec Changed on phil's comments 2015-07-21 12:20:15 -05:00
Ergovisavi
e6a8511ac1 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire 2015-07-21 05:50:02 -07:00
Ergovisavi
5f6cf57e07 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire 2015-07-21 05:32:08 -07:00
phil235
76feff5dfa Merge branch 'master' of https://github.com/tgstation/-tg-station into HandcuffOverlayFix 
Conflicts:
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/head/helmet.dm
	code/modules/mob/living/carbon/carbon.dm
 2015-07-20 22:37:06 +02:00