cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,190 Commits 61 Branches 14 Tags
e4281bbaabbc3190e84ca6c1df12116debfd010d
Commit Graph

5258 Commits

Author SHA1 Message Date
Swag McYolosteinen
e4281bbaab Merge pull request #10019 from Thunder12345/autoshotgun 
Moved combat shotguns to shotgun/automatic/combat
 2015-06-19 17:06:00 +02:00
Swag McYolosteinen
1dde070d18 Merge pull request #9800 from Dorsisdwarf/wittybranchname 
Buffs nuke ops [merge ready]
 2015-06-19 12:00:23 +02:00
Thunder12345
1c83cc6d45 Pray pray pray 2015-06-18 18:07:57 +01:00
Cheridan
470f21a752 Merge pull request #10004 from Ikarrus/gangimplants 
Gang Update: Loyalty Implant Edition
 2015-06-18 10:41:15 -05:00
phil235
e6dcabf245 Merge pull request #9960 from xxalpha/bass 
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
 2015-06-18 15:50:35 +02:00
phil235
98c158f958 Merge pull request #9845 from AnturK/buttsender 
Adds PDA-Message Photo Attachment
 2015-06-17 20:36:52 +02:00
Cheridan
ee87a1dc23 Merge pull request #9974 from phil235/MirrorRaceChangeFix 
Mirror race change fix
 2015-06-17 12:54:19 -05:00
phil235
e52486cf8e Merge pull request #9933 from xxalpha/rapiddeconstructiondevice 
Fixes RCD wall deconstruction runtime.
 2015-06-17 17:13:39 +02:00
Thunder12345
bfb2345726 Moved combat shotguns to shotgun/automatic/combat 
- shotgun/automatic/ will pump itself automatically on firing
 - combat shotgun capacity nerfed to 6 rounds
 - replaced all instances of the old path with the new one
 2015-06-17 15:25:59 +01:00
phil235
63aa008077 Merge pull request #9401 from Firecage/ofgibtonite 
Adds a check to prevent a future ranged Gibtonite message + fixed the message
 2015-06-17 15:12:10 +02:00
Cheridan
c7029ff806 Merge pull request #9799 from kyrahabattoir/glassUtility 
Mapping tool: adds a "structure" spawner that can be used to create "…
 2015-06-16 13:25:00 -05:00
Jordie
26d75cc5ba Merge pull request #9863 from MrPerson/508_compilation 
Makes the game compile in byond version 508
 2015-06-16 19:38:11 +10:00
Ikarrus
210cc17d5c Loyalty Implants and Gang Mode 
Security treating gangs like revs has had a very negative impact on the experience of gang rounds. With an easy and convenient deconversion method, gangs are easily stomped as they rapidly run out of members to convert. So I'm going to try something different and see how things go if implants in gang mode acted as they are in cult.

- Implants can still prevent conversion, but can no longer deconvert or identify gangsters
- If a recruitment pen fails, the error message the gang boss receives will distinct loyalty implanted individuals from enemy gangsters.
 2015-06-15 21:39:21 -06:00
phil235
ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval 
Unnecessary space removal from spans and messages
 2015-06-15 18:20:04 +02:00
phil235
d275152a96 Fixes the wizard magic mirror race change. 
Fixes the "race swap" wizard event.
 2015-06-15 17:01:07 +02:00
Jordie0608
8fc003029c Merge branch 'master' of https://github.com/tgstation/-tg-station into ironicthatonehumanisasectorzerolaw 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2015-06-15 16:34:56 +10:00
phil235
2e7ddc1f45 Merge pull request #9053 from MrPerson/screen_alert_2 
More screen alerts
 2015-06-15 01:00:20 +02:00
Cheridan
ec8cd61d4c Merge pull request #9808 from Incoming5643/march_of_the_snowflakes 
WJohn's Hyper Customizable Lizard Sprites
 2015-06-14 17:40:20 -05:00
Cheridan
5e425cad89 Merge pull request #9945 from phil235/ExplosionThrowAnchorFix 
Explosions no longer throw anchored items.
 2015-06-14 17:26:10 -05:00
Cheridan
e9419764f7 Merge pull request #9929 from kingofkosmos/seclockerfix 
Locker unlocks if you attack it with an empty hand
 2015-06-14 17:12:44 -05:00
xxalpha
b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
Cheridan
565e4dda5a Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit 
Overlays for computers
 2015-06-14 10:25:27 -05:00
kingofkosmos
c8d79e7034 Removed unnecessary spaces in these situations: 
"span class = '" changed to "span class='"
"'> " changed to "'>"
 2015-06-14 12:13:19 +03:00
phil235
7adeaf0beb Explosions no longer throw anchored items. 2015-06-14 00:46:54 +02:00
xxalpha
e90b472800 Fixed RCD wall deconstruction runtime. 2015-06-13 13:17:02 +01:00
Jordie0608
752f5e883d eol conversion 2015-06-13 20:15:49 +10:00
Jordie0608
5ef93b2225 overlays for computers 2015-06-13 20:07:48 +10:00
kingofkosmos
899f2f5119 Security locker unlocks if you attack it with an empty hand. 2015-06-13 11:20:33 +03:00
Razharas
29730ce479 Merge pull request #9412 from RemieRichards/ReactionaryExplosions 
Ports VG's DeityLink's new explosion method
 2015-06-13 04:45:23 +03:00
Razharas
b7150068cc Merge pull request #9783 from nukeop/master 
Adds a chemistry bag for moving large amounts of patches/pills/bottles at once
 2015-06-13 04:42:16 +03:00
Razharas
7dbd3b13da Merge pull request #9872 from xxalpha/itsalwaystrue 
Fixes infinite cyborg stack usage on a couple of things.
 2015-06-13 04:34:05 +03:00
Razharas
4373f6eece Merge pull request #9904 from xxalpha/runtimesrun 
Fixes three runtimes.
 2015-06-13 04:29:20 +03:00
Razharas
ec6c0465b5 Merge pull request #9879 from Incoming5643/skeleton_man 
Magic Mania 1.91: Life's a lich and then you rework the mechanic to be less terrible
 2015-06-13 04:24:38 +03:00
Ikarrus
78ec879f27 - Ghosts can hear gang messages 
- Gang spraycans no longer have a unique name for more stealth
 2015-06-12 08:22:42 -06:00
Ikarrus
d2ef043690 Resolved Conflicts: 
code/modules/mob/living/living.dm
 2015-06-11 23:46:59 -06:00
Incoming
595bb0c8e4 Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list 
Random lizard bodies will finally have color!

Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.

Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
 2015-06-12 00:43:35 -04:00
xxalpha
9ba7e6aaf4 Fixes three runtimes. 
Better fix. src. purge
 2015-06-11 21:30:13 +01:00
Cheridan
7363088cbc Merge pull request #9802 from Miauw62/AyeEye 
Nerfs the AI in several minor ways.
 2015-06-11 14:13:52 -05:00
Cheridan
808ffb4160 Merge pull request #9902 from Miauw62/inexperience 
Removes strip_html_properly(), replaces it with html_encode().
 2015-06-11 10:31:53 -05:00
Remie Richards
d72cb4bdf1 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReactionaryExplosions 
Conflicts:
	code/game/machinery/doors/poddoor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/unsimulated/walls.dm
	code/modules/admin/admin_verbs.dm
 2015-06-11 16:23:45 +01:00
Remie Richards
1800c56456 Merge pull request #9769 from Cheridan/ACTUAL_FUN_REMOVAL 
Adjusts Chaplain Special Bible Equipment
 2015-06-11 16:15:41 +01:00
Miauw
a881478743 Removes strip_html_properly(), replaces it with html_encode(). 
It was not as proper as the name would imply, and experience and amused redditors have taught me that writing a proper HTML-scrubbing function is a very hard task indeed.
 2015-06-11 15:37:41 +02:00
Dorsisdwarf
7afd81e083 removes loaded bag from locker, adds to uplink at discounted price. Lowers cost of least-used ammo type 2015-06-11 08:09:36 +01:00
Ikarrus
59d9098d26 Gang Update 2015-06-10 23:05:58 -06:00
Incoming
1f0097a74a Adds the bind soul spell for wizards. It turns them into a lich (skeleton) and gives them access to a long cooldown ressurection spell (starts at 3 minutes). 
The ressurection spell can only be used while dead/dying and charges at all times. When used the lich gains a new body at the site of their phylactery and is stunned for a short while. Meanwhile the old wizard body crumbles to dust leaving all the wizards worldly possessions on the ground. Anyone who sees the corpse crumble will also get a cardinal direction pointing towards the wizard.

Every time the wizard dies this way, the time between ressurections is increased by a minute. To take a lich out of the game for good, either destroy the body before the lich can cast the spell again, or destory the phylactery and kill the wizard one last time.

Liches spawn with robes and spells intact, but nothing else, everything collected on their original body stays there.

As a balance issue, this spell can't be used in the den, the item must be bound after arriving at the station.

Adds a nice black wizard robe ensemble for liches.

Magic mirrors (save for a special badmin only one) can no longer skeletonize people.

Adds a hopeful mulligan fix to wizard rounds problems. Also corrects an adminlog message.
 2015-06-10 03:40:14 -04:00
xxalpha
ed6b1d137c Fixes infinite cyborg stack usage on a couple of things. 
Kill debug msg

Better fix.

Finished better fix.

NOW FINISHED
 2015-06-10 03:27:04 +01:00
Razharas
b873176a77 Merge pull request #9821 from Cheridan/just_cuff_my_shit_up 
REMOVES CABLE CUFFS...
 2015-06-10 01:17:35 +03:00
MrPerson
7c3cb399d0 Makes the game compile in byond version 508 
throw is a reserved keyword so all throw() and var/throw had to be renamed.
Only compile tested because I'm fucking lazy.
 2015-06-09 04:14:12 -07:00
MrPerson
9dc713ba9c Merge branch 'master' of https://github.com/tgstation/-tg-station into screen_alert_2 
Conflicts:
	code/_onclick/hud/alert.dm
	code/game/objects/items.dm
	code/modules/mob/living/carbon/human/human.dm
	icons/mob/screen_alert.dmi
 2015-06-09 03:23:18 -07:00
Cheridan
d7e3363129 Merge pull request #9817 from xxalpha/dropfixes 
Fixed hacking from inside machines.
 2015-06-08 21:27:32 -05:00