cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-09 07:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,495 Commits 63 Branches 14 Tags
46d7fb9bbd6531da30269cc0df27ecbae982e12a
Commit Graph

1341 Commits

Author SHA1 Message Date
Cheridan
b9cdb3384a Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours 
Icon and code improvements to fancy storage, cigarette packs, lighters, droppers and syringes
 2015-06-26 15:34:24 -05:00
Jordie0608
d3f78294ad fixes edit reason and log for follow 2015-06-26 16:13:40 +10:00
Jordie0608
58399f7602 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours 
Conflicts:
	icons/obj/items.dmi
 2015-06-24 20:31:51 +10:00
Jordie0608
29d7122095 Merge branch 'master' of https://github.com/tgstation/-tg-station into idkhowtheserverevenranwiththiserroraround 2015-06-24 16:48:17 +10:00
Jordie
dbad5fdea4 critical fix to admin memos 2015-06-24 15:58:41 +10:00
Cheridan
c7e0b96314 Merge pull request #10083 from MrStonedOne/ISTHISVALID 
Admins can now reject shitty adminhelps
 2015-06-23 14:26:11 -05:00
Cheridan
7b6fdbc8ce Merge pull request #9556 from Jordie0608/thisisnothebeginningoftotalatarinismthathappenedearlier 
Ports watchlist flagging for ckeys
 2015-06-22 23:36:06 -05:00
MrStonedOne
40c2ca5966 Tweaks adminhelp rejections and adds changelog 2015-06-21 13:23:42 -07:00
MrStonedOne
9583b1213b Adds new timer subsystem 
Adminhelps now use it so that they can cancel the timer to return the admin help verb.
Adminhelps now allow admins to reject the adminhelp, giving the user back the verb and a message telling them how to construct a better admin help.
 2015-06-21 11:55:38 -07:00
Jordie0608
25445e5a05 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-06-20 17:32:16 +10:00
Cheridan
a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen 
Various admin improvements
 2015-06-20 00:53:30 -05:00
phil235
f976ae8a58 Merge pull request #9957 from MrStonedOne/boomboomshaketheroom 
Makes the bomb cap a config option.
 2015-06-17 14:17:09 +02:00
Jordie0608
0bf6f09969 Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen 
Conflicts:
	code/modules/admin/verbs/pray.dm
 2015-06-16 17:24:20 +10:00
Jordie0608
34fb8cc8bc toggle nuke and set sec level button, flamethrower logging 2015-06-16 17:19:56 +10: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
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
MrStonedOne
7cfff6f1ca Secrets clean up/configurable bomb cap 
Moves Secrets to it own file so its not stinking up admins.dm and topic.dm

Makes the bombcap configurable rather then being a per-round only thing.
 2015-06-14 09:08:27 -07:00
MrStonedOne
8079872d35 Makes changing the bomb cap more fine grain 
Also changes the other 2 bomb cap values
 2015-06-14 07:38:40 -07:00
Jordie0608
a67de221cc JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging 2015-06-14 23:37:35 +10: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
Jordie0608
3e07dbc5a9 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours 
Conflicts:
	icons/obj/chemical.dmi
 2015-06-13 20:23:29 +10: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
486888f801 Merge pull request #9630 from AnturK/vv_assoc 
Fixes varediting associative lists
 2015-06-13 04:44:24 +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
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
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
debb7da66b Merge pull request #9588 from AnturK/build_area 
Adds map generators to build mode
 2015-06-11 12:50:20 +01:00
Razharas
6f624b79df Merge pull request #9139 from Xhuis/pray_4_fun 
Adds prayer sounds to admins + prioritizes chaplain prayers
 2015-06-11 02:58:46 +03:00
Jordie0608
77b2e54de7 code improvement and overlays for fancy storage, dropper, syringe and lighter 2015-06-10 18:58:19 +10: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
MrStonedOne
ff5c9d3f5b fixes readmin when username had upper case letters 
fixes #9775
 2015-06-09 01:18:22 -07:00
Incoming
bff351c555 Intergrates lizard parts into dna stuff so changelings can properly steal them. 
Turns all the lizard options into one associated list instead of their own vars, for tidiness

Shuffles horns behind frills in terms of layering
 2015-06-07 21:05:34 -04:00
Iamgoofball
a9c25caef3 forgot the new admin debug verb 2015-06-06 18:50:14 -07:00
Iamgoofball
8aa79e1f1c fixes and changes 2015-06-06 18:40:38 -07:00
Cheridan
6ca4cb1e64 Merge pull request #9735 from Jordie0608/whyevenhavetwoverbs 
World.Reboot() Improvement
 2015-06-05 16:43:13 -05:00
AnturK
d43e8320b2 Adds area generators to build mode 
Adds two generators : Asteroid and Syndicate
Syndicate templates
Finish syndicate templates
Moves border and repressurize to helpers.dm
Repressurize generator
Shuttle generator
Buildmode now resets the corners when switching modes/generators
 2015-06-03 21:57:11 +02:00
Jordie0608
bd7019e033 standardizes Reboot(), allows round to be delayed after it finishes and removes immediate reboot verb 2015-06-01 22:07:22 +10:00
Firecage
f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Firecage
84e8690ec6 merge conflict fix 2015-05-31 02:45:46 +02:00
Firecage
3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
AnturK
c58142d394 Stability fix 2015-05-29 19:42:41 +02:00
Incoming
69f8f6575b Antagonists Will No Longer Show Up as MODE in round end reports. 
Instances where the game would give special treatment to MODE players will instead check to see if a player's assigned_role (job) matches their special_role (antag status). All antags that start off station (as well as ninjas for some weird reason) were affected.

Fixes #8743
 2015-05-25 15:58:32 -04:00
Remie Richards
c5a2c5d396 Merge pull request #9572 from Aranclanos/stealthAdminPM 
Fixes admin-PM on stealth
 2015-05-25 18:28:32 +01:00
Remie Richards
61c0ddebbb Merge pull request #9553 from AnturK/probing_fan_club 
Adds abductees to check antags panel
 2015-05-25 18:14:10 +01:00
Cheridan
f12f12ed60 Merge pull request #9562 from Aranclanos/newscaster 
Newscaster code big cleanup.
 2015-05-24 19:47:05 -05:00
Cheridan
8cc916c52b Merge pull request #9618 from phil235/RuntimesMustDie 
More runtimes fixed
 2015-05-24 18:11:13 -05:00
AnturK
3b1a5fbdca Fixes some false positives 2015-05-24 15:11:50 +02:00
AnturK
2638a5d4e9 Fixes editing associative lists 2015-05-24 14:56:39 +02:00
phil235
f643769ef4 Fixes some runtimes with bluespace artillery, handcuffs on simple animals, lobby music start, stunbaton attack, kitchen bowl update_icon, particle accelerator admin log message, and plasmaman spec_life(). 2015-05-23 22:34:04 +02:00
Razharas
1f0cbbf82b Merge pull request #9571 from bear1ake/respawn-char-fix 
Fix #4332. Also fixes mutant race respawn-char.
 2015-05-23 13:43:49 +03:00