cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-29 18:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,265 Commits 61 Branches 14 Tags
14606bea5e59e33c9e8aee671b2cedf1007dd0ef
Commit Graph

4351 Commits

Author SHA1 Message Date
AnturK
dbeec9a194 Merge pull request #15402 from octareenroon91/FIX-SORD-FIX 
Refactor suicide
 2016-02-12 16:49:06 +01:00
Joan Lung
35ab127543 Merge pull request #15389 from KorPhaeron/babydontfearthereaper 
Fixes reaper scythe item_state
 2016-02-11 12:30:01 -05:00
duncathan salt
c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc 
Fix a number of runtimes
 2016-02-10 23:50:38 -06:00
duncathan salt
ca8e3c6a0a Merge pull request #15157 from LanCartwright/nomorehardsuit 
Removes hardsuit from bulldog bundle
 2016-02-10 21:21:42 -06:00
Cheridan
eeb96cb7a5 Merge pull request #15360 from neersighted/ionsomething 
Remove borg jetpack, give them ion thrusters instead
 2016-02-10 18:19:13 -06:00
phil235
0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
 2016-02-10 22:35:19 +01:00
octareenroon91
61796470b8 Fix suicide_act message text 2016-02-10 15:22:09 -06:00
octareenroon91
ae21d76bf8 Refactor suicide 
Buff the SORD: you can now do 200 damage. Of stamina damage. To yourself. By attempting suicide.
 2016-02-10 15:01:08 -06:00
KorPhaeron
bbd20807b7 Indents with tabs instead of spaces 2016-02-10 10:38:51 -06:00
Bjorn Neergaard
85e80780ce Fix storage runtime 
Mobs without clients can't see into storage! They have no screen!

The following runtime has occured 92 time(s).
runtime error: Cannot read null.screen
proc name: show to (/obj/item/weapon/storage/proc/show_to)
  source file: storage.dm,104
  usr: Leo Pfeifer (/mob/living/carbon/human)
  src: the backpack (/obj/item/weapon/storage/backpack)
 2016-02-10 07:20:25 -06:00
KorPhaeron
3c2c923b22 Fixes scythe item_state 2016-02-10 05:06:18 -06:00
duncathan salt
9a6300e2a2 Merge pull request #15173 from KorPhaeron/holy 
Allows the chaplain to choose his holy weapon theme
 2016-02-09 23:42:56 -06:00
KorPhaeron
91ecb5a603 Fix for the fix 2016-02-09 23:31:34 -06:00
KorPhaeron
2566e424b3 Fixes, special effects for whip and carp 2016-02-09 23:14:50 -06:00
Bjorn Neergaard
173387eefc Remove borg jetpack, give them ion thrusters instead 
Also clean up jetpack human movement because wow that code was messy
Its still bad but its better (tm)
 2016-02-09 14:53:37 -06:00
tkdrg
ba2e629525 Merge pull request #15286 from AnturK/bagofboom 
Adds C4 bag to uplink
 2016-02-08 21:39:31 -03:00
Bjorn Neergaard
f97c8a00f2 Internals action button 2016-02-08 17:10:04 -06:00
Bjorn Neergaard
eaa6bc7b18 Implement better jetpack action button 2016-02-08 17:09:12 -06:00
KorPhaeron
d25e113ecc Removes unused defines 2016-02-08 11:15:45 -06:00
KorPhaeron
c2b77be84b Better list/choosing of holy weapons 2016-02-08 11:12:33 -06:00
AnturK
f6f7943189 Adds C4 bag to uplink 2016-02-08 16:10:34 +01:00
tkdrg
6e9441b81e Merge pull request #15269 from AnturK/fixerinio 
Fixes crayon/spraycan buffer mode.
 2016-02-08 11:42:46 -03:00
tkdrg
3bd79ccadb Merge pull request #15262 from neersighted/damnshuttle 
Rework crates, supply packs, and supply orders
 2016-02-08 11:36:26 -03:00
Bjorn Neergaard
f19feb4505 Remove dupe file, remove colon cancer and add prespawned stacks 2016-02-08 01:16:30 -06:00
tkdrg
7dc0de7a87 Merge pull request #15239 from TrustyGun/janikeys 
The janitor's belt can now hold his janicart keys.
 2016-02-07 21:18:21 -03:00
phil235
83633edfed - I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping) 
- renamed the eye_stat var to eye_damage.
- mob/on_varedit() added. Manually var editing a mob's eye_blind var properly updates his vision.
- I removed update_vision_overlays(), we now just update the relevant fullscreens instead of all fullscreens whenever one needs to be updated.
- fixed climbing into mecha not giving you mecha sight.
- simplified and removed copypasta from update_tinttotal() (now update_tint() )
 2016-02-07 18:50:18 +01:00
AnturK
ed47afaa05 Fixes crayon/spraycan buffer mode. 2016-02-07 13:18:10 +01:00
Bjorn Neergaard
4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
phil235
99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/modules/reagents/chemistry/holder.dm
 2016-02-06 20:38:16 +01:00
KorPhaeron
66f8d450ac Chaplain weapon code cleanup 2016-02-06 12:10:48 -06:00
tkdrg
7b602a35b5 Merge pull request #15217 from neersighted/flashy 
Fix flashlights flashing
 2016-02-06 14:21:14 -03:00
tkdrg
0dbbcce675 Merge pull request #15216 from KorPhaeron/fixes_bulldogs 
Fixes bulldogs being unable to load special ammo
 2016-02-06 14:19:35 -03:00
TrustyGun
99f2200d10 doh 2016-02-06 10:58:56 -05:00
TrustyGun
55f9adfa87 The janitor's belt can now hold his keys 
This always bothered me.
 2016-02-06 10:41:38 -05:00
phil235
fdec37b76f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
 2016-02-06 15:42:13 +01:00
Bjorn Neergaard
b9c79680b9 Rename get_ui_data -> ui_data, remove useless shuffle from wires 2016-02-05 17:09:40 -06:00
Bjorn Neergaard
14ee8eec08 Fix tank UI for ghosts 
istype is needed
 2016-02-05 17:06:08 -06:00
Bjorn Neergaard
29fdf73cc6 tgui power monitor; linegraph component 2016-02-05 17:06:04 -06:00
KorPhaeron
2f6c9ec50e Bulldog Fix 2016-02-05 12:06:53 -06:00
Bjorn Neergaard
289f0c19e1 Fix flashlights flashing 2016-02-05 12:06:44 -06:00
tkdrg
b3daf4be22 Merge pull request #14981 from neersighted/510 
BYOND 510
 2016-02-05 00:04:59 -03:00
Bjorn Neergaard
ac03d5f617 Fix flashlights actually stunning 
Also make clear_fullscreen() waitfor = 0 to be safe,
and bump travis version
 2016-02-04 20:50:26 -06:00
phil235
1be9855d4f Merge pull request #15174 from kingofkosmos/healthanalyzerhealthfix 
Health analyzer percentage fix
 2016-02-05 02:07:57 +01:00
KorPhaeron
d27268f094 Grammar fixes, adds carp-sie plushie 2016-02-04 17:58:47 -06:00
Bjorn Neergaard
7a47b43c53 Re-implement screen overlays 
This fixes 510 showing all overlays in the rightclick menu
 2016-02-04 17:19:44 -06:00
Bjorn Neergaard
063dd9fb84 Get the code running on 510 
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
 2016-02-04 17:19:40 -06:00
kingofkosmos
a251e61621 Reverts the span change in time of death. 2016-02-04 19:50:08 +02:00
phil235
16d0154d9f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 2016-02-04 17:04:10 +01:00
phil235
0daa87f9be More merge conflict fixes. 2016-02-04 15:48:33 +01:00
phil235
8b11d87b1d Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/_onclick/hud/alert.dm
	code/_onclick/hud/hud.dm
	code/datums/mutations.dm
	code/datums/wires/robot.dm
	code/game/atoms.dm
	code/game/gamemodes/blob/overmind.dm
	code/game/machinery/alarm.dm
	code/game/machinery/machinery.dm
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/morgue.dm
	code/modules/admin/verbs/adminjump.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/carbon/alien/humanoid/death.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/human/species_types.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/login.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/chemistry/reagents/blob_reagents.dm
	tgstation.dme
 2016-02-04 14:34:45 +01:00