cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-05 22:09:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,804 Commits 63 Branches 14 Tags
7a87e032637f258b83424995305584bdcc270708
Commit Graph

2235 Commits

Author SHA1 Message Date
Cheridan
e43b06f750 Merge pull request #20591 from ChangelingRain/proofofconceptantagdatum 
"Working Datum Antagonists"
 2016-09-29 13:33:59 -05:00
Joan Lung
dafccd0f1a Merge pull request #20726 from phil235/PreliminaryDamageRefactor 
Some preliminary changes before the damage refactor PR.
 2016-09-29 10:07:51 -04:00
AnturK
7ce4f1293d Merge pull request #20734 from CyberbossJHCB/NothingToSeeHere 
Showers now clean hands + bloody gloves fix
 2016-09-29 10:46:31 +02:00
phil235
194398cbbd Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor 
# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm
 2016-09-29 01:44:27 +02:00
Joan Lung
aaefef46b8 Merge pull request #20732 from optimumtact/justhrefthings 
Fix multiple href exploits from incorrectly scoped locates
 2016-09-28 19:00:44 -04:00
oranges
8b7eb11df9 Fix multiple href exploits from incorrectly scoped locates 
Also adds a helper to flatten a keyed list to it's contents as it
turns out that byond cannot locate in a keyed list
 2016-09-28 06:55:45 +00:00
Cyberboss
9b11a70902 Git is hard 2016-09-27 20:16:36 -04:00
phil235
2d2975f783 Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise. 
This just adds some vars that the refactor will use. Putting this in a separate PR prevent the damage refactor PR from becoming too big (number of files changed) and hard to read and review.

Introduces the resistance_flags bitflag that replaces unacidable and burn_state.
Moves the armor var from item to /obj level and gives specific armor values to many objects, the armor list also gets two new armor types: fire and acid, which will be used in the refactor. the new fire and acid armor values are given to plenty of items.
 2016-09-27 22:33:08 +02:00
phil235
6809603669 Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them. 
Adds a large ash and large molten item decal (for future use)
simplifies decal/cleanable/replace_decal() code a bit.
Changes construction() proc to on_construction() for consistency, same for deconstruction().
Made a deconstruct() proc for machinery and computer (also for future use).
 2016-09-27 19:58:27 +02:00
ExcessiveUseOfCobblestone
9d54b28e9b Fixes Intellicard view-locking bug (#20682) 
* Update ai_core.dm

* Update ai.dm

* Update mecha.dm

* Update mecha.dm

* Update mecha.dm

* Update ai_core.dm

* Update ai.dm

* Update ai_core.dm

* Update ai.dm

* Update ai_core.dm
 2016-09-27 13:40:45 +02:00
oranges
04a42ee479 Merge pull request #20647 from KorPhaeron/bossofthisgym 
Boss of this Fitness Room
 2016-09-25 12:31:33 +13:00
kevinz000
a50c6a2c6f Grills now properly tesla bolt when things are tossed at them (#20634) 
* tesla_grills

* balance
 2016-09-24 19:54:12 +12:00
KorPhaeron
692f809e28 Boss of this Gym 2016-09-22 21:32:08 -05:00
AnturK
11c149abbf Merge pull request #20600 from Ergovisavi/hurr_durr 
Minor anomalous crystal fixes
 2016-09-21 12:41:41 +02:00
Joan Lung
d41971d7ed Merge branch 'master' of https://github.com/tgstation/tgstation into proofofconceptantagdatum 
Conflicts:
	code/game/gamemodes/game_mode.dm
 2016-09-20 19:03:20 -04:00
Cheridan
a930355581 Merge pull request #20572 from AnturK/godisdead 
Removes Hand of God gamemode.
 2016-09-20 13:46:52 -05:00
AnturK
14886c1bac fixup 2016-09-20 18:52:31 +02:00
AnturK
6700f30012 Repathes structures to fluff, traps to their own path 2016-09-20 17:36:27 +02:00
Ergovisavi
72f9b60190 Fixes some issues with anomalous crystals 2016-09-19 20:30:38 -07:00
Joan Lung
64667136d5 heavyweight class 
this is ~eh, but it's this or Another Antag Removal Proc and, god, let's not.
 2016-09-19 13:18:51 -04:00
AnturK
93f444fd38 Removes Hand of God gamemode. 2016-09-18 13:32:26 +02:00
Marc R. Uchniat
dc1287a176 allow kitchen spikes to be welded apart 2016-09-17 22:42:27 -04:00
Joan Lung
ee9814465c Fixes a bit of brasscode 2016-09-13 17:11:57 -04:00
Cheridan
2a0168abdb Merge pull request #20434 from ChangelingRain/idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur 
Moves all beam icon states to beams.dmi
 2016-09-13 11:55:24 -05:00
Joan Lung
0067bd1332 Adds brass, used to construct various brass objects (#20419) 
* Adds brass, used to construct various brass objects

* brasshole

* give em the brass

* give em more brass

* DYNAMIC

* VAR MURDER SPREE

* brassy

* acceptaphil

* this is super against my general preferences but eeeeeh sure okay i guess
 2016-09-13 12:16:28 +02:00
Joan Lung
9c6fdc97f6 Makes mineral doors marginally less shitty (#20429) 
* Makes mineral doors marginally less shitty

* TESTING IS FOR LIZARDS

* TYPING IS ALSO FOR LIZARDS
 2016-09-13 09:19:21 +12:00
Joan Lung
179b0b532d Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur 
Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi
 2016-09-12 17:14:39 -04:00
PKPenguin321
f2b6543c1b tesla grille nerf (#20412) 2016-09-13 09:07:47 +12:00
Remie Richards
c50fa5729c Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work 2016-09-10 20:28:23 +01:00
Joan Lung
fbe2430ff8 Moves all beam icon states to beams.dmi 2016-09-10 13:09:44 -04:00
Cheridan
94bb371f30 Merge pull request #20402 from ChangelingRain/iwasabillionlittlepiecestilyoupulledmeintofocusastronomyinreverseitwasmewhowasdiscovered 
Makes cult structures destructible and readds them
 2016-09-10 11:43:59 -05:00
Joan Lung
5bdfd1665f Merge pull request #20328 from Ergovisavi/bring_colossus_back_2016 
New colossus loot, the "Anomalous Crystal"
 2016-09-08 22:38:50 -04:00
Joan Lung
b245319979 Adds some very fancy tables (#20388) 
* Adds some very fancy tables

* even fancierer

* smoothing sprites are like a jigsaw puzzle for assholes
 2016-09-09 14:09:16 +12:00
Joan Lung
eec5ca0823 that which is done is done 2016-09-08 10:13:13 -04:00
Ergovisavi
4e4f091905 Merge branch 'master' of https://github.com/tgstation/-tg-station into bring_colossus_back_2016 2016-09-07 01:08:58 -07:00
Ergovisavi
8605809c57 New colossus loot, the "Anomolous Crystal" 2016-09-07 00:58:15 -07:00
oranges
aa4fc60434 Merge pull request #20291 from jughu/Mission-oxy 
Guarantees a breath mask in oxygen lockers
 2016-09-05 08:41:05 +12:00
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
Joan Lung
266bacf4c8 Bubblegum now charges past its target's location 2016-09-03 12:09:08 -04:00
jughu
a568fb9632 fixes the emergency locker 2016-09-03 01:07:41 +02:00
Remie Richards
aa7ae7dc38 Fixes cloth from cutting bedsheets ending up INSIDE THE USER (#20286) 2016-09-02 12:40:16 -05:00
Remie Richards
897e8c5b88 Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work 
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
 2016-09-02 18:04:18 +01:00
Remie Richards
00738bd2a3 More than 2 hands!? WHAAAAAAT 2016-09-02 16:10:16 +01:00
oranges
8b5697f37d Merge pull request #20175 from bgobandit/functionality 
You can hide small items inside urinals now.
 2016-09-02 14:58:38 +12:00
Kromgar
2b235b8bba Revert "Fixes issues with packagewrap, trashbag, handlabeler, " 2016-09-01 12:18:24 -04:00
oranges
00495cedc5 Merge pull request #20186 from phil235/InsertFix2 
Fixes issues with packagewrap, trashbag, handlabeler,
 2016-09-01 10:13:30 +12:00
KorPhaeron
7b2a1b6aa7 Fixes another batch of typos. (#20234) 2016-08-30 21:52:19 -05:00
bgobandit
27e355d16b Fixes another batch of typos. 2016-08-30 20:57:28 -04:00
bgobandit
250ad0f213 untypecasts 2016-08-30 19:02:09 -04:00
phil235
42301f32e2 Fixes issues with packagewrap, trashbag, handlabeler, and other potential items that must have an effect when clicking a storage item. Clicking a storage item with those items does not try to insert them in the container but instead calls their afterattack effect directly. The var used for those items is var/no_direct_insertion. 
Fixes trashbag not being able to pick up pillbottles, evidence bags.
Fixes packagewrap not being able to wrap backpacks, pillbottles, all sorts of bags.
Fixes packagewrapping a locked lockbox showing "it's locked!"
Backpack only make rustling noise if insertion is successful.
 2016-08-28 19:38:15 +02:00