cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 12:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,855 Commits 61 Branches 14 Tags
e596ffe2ba5ea5c2bb225170b794a6dc89200906
Commit Graph

684 Commits

Author SHA1 Message Date
Incoming
ca920321ae Merge branch 'master' of https://github.com/tgstation/-tg-station into bombchange 
Conflicts:
	maps/tgstation.2.1.2.dmm
 2013-12-06 12:20:35 -05:00
Giacomand
088cb5afd3 Merge branch 'master' of https://github.com/tgstation/-tg-station into virus_tweak 
Resolved Conflicts:
	html/changelog.html
 2013-12-02 20:20:35 +00:00
Giacom
0862393aeb Merge pull request #1924 from Limeliz/GamelogFix 
Removed href-stuff being saved in adminlogs.
 2013-12-01 03:41:31 -08:00
Emil
95a2fff302 Fixed out of date mind.dm, then applied the fix. 2013-11-30 00:17:38 +01:00
Emil
e82a06fc68 Update mind.dm 
Should fix #1870 where href-crap was saved in the adminlogs.
 2013-11-28 15:55:01 +01:00
Giacomand
2e5d4c4fcc Merge branch 'master' of https://github.com/tgstation/-tg-station into virus_tweak 
Resolved Conflicts:
	html/changelog.html
 2013-11-27 15:58:42 +00:00
Aranclanos
42f5883cdf Added a check for the target of the magic missile between the sleeps. This will stop the runtimes and the MM objects from being stuck in the spot (I think you can pull them though) 2013-11-27 05:47:36 -03:00
Aranclanos
3fed8dd8f6 Merge branch 'Cybernetic-limbs' of https://github.com/RobRichards1997/-tg-station into Cybernetic-limbs 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
 2013-11-26 22:03:26 -03:00
Giacomand
61a7049cd7 Viruses are less random and you can determine the level of symptom you would get. Virus food will generate low level symptoms, Mutagen will generate medium level symptoms and Liquid Plasma will generate high level symptoms. 
Virologist starts with a small bottle of liquid plasma.
Filled in the gaps between the chem master with RGBA(255, 255, 255, 1) so you do not accidentally click on the floor anymore.
ChemMasters now has the green light overlay, which is only used by Pandemics but it looks better than red.
 2013-11-26 19:33:39 +00:00
Incoming
e428e04787 Adds sprites for the detonator and the bomb core 
Fixes some punctuation
 2013-11-24 17:35:31 -05:00
Giacom
d7b6001f98 Merge pull request #1835 from Cheridan/NukePR 
Scale Ops 1.1
 2013-11-24 13:51:07 -08:00
Cheridan
f0c7163af7 Merge pull request #1865 from Aranclanos/HumanizeButWheresTheMonkey 
Humanize() runtimes
 2013-11-23 16:01:45 -08:00
Cheridan
df9bc262bf Merge pull request #1798 from kyrahabattoir/vending-reloadedB 
Vending reloaded!
 2013-11-23 11:40:34 -08:00
Cheridan
7bba87b7ab Merge pull request #1854 from Aranclanos/NanoUIMobTransformations 
NanoUI mob transformation runtime fix
 2013-11-23 11:01:29 -08:00
Aranclanos
c9f4de2834 Added some sanity check for when the humanize() proc call finishes. This proc includes a sleep() and it might return nothing of the mob is deleted before the sleep ends. 
Others way to engage the issue wouldn't be fair.
 2013-11-22 18:38:39 -03:00
Aranclanos
6a2bc0b6c5 Added some sanity after the spawn() procs in the wire datums of APCs 2013-11-22 15:50:28 -03:00
Incoming
87872e81e1 Syndicate Bomb Tweaks: 
Syndicate Bombs now have enforced 60 second minimum timers, up from 30. Their crystal cost remains at 5.
Syndicate Detonators that can get around the 60 second timers are purchasable for 1 crystal for all (there are also ways to get around it with clever uses of the wires, but that's not new)
The Nuke Agents get a free syndicate detonator [MAP]
Syndicate Bombs can now be further disassembled beyond disarming them to let people actually lift the explosives out of the bomb, rendering it useless. These explosives will only detonate in the presence of another explosion, and give great research levels.
 2013-11-22 04:01:51 -05:00
Aranclanos
6e7a7b365b NanoUIs will now only transfer their mob UI list on a mob transformation if the old mob exists. No extra checks, just better placement for the NanoUI user_transfered() proc call. 
This will fix some runtimes.
 2013-11-22 05:09:47 -03:00
Cheridan
d814414227 Scale Ops 1.1 
Reduces the costs of some items based on feedback.
Op lockers now start with a new miniaturized jetpack.
 2013-11-20 17:59:02 -06:00
Kyrah Abattoir
e6ee419f47 ADDED costume restocking unit 
REMOVED many useless comments
ADDED invoke vending_refill consutructor superclass

ADDED: Cargo can order the autodrobe supply crate
 2013-11-18 19:15:23 +01:00
Robson Richards
e71ea3289e Merge branch 'master' of https://github.com/tgstation/-tg-station into 13/10/2013-Limb/organ-stuff 
This probably broke everything... :(
 2013-11-17 18:09:14 +00:00
Robson Richards
890362a61a Commiting some soft Updates of commits I'm behind on and Committing the rest via git. 2013-11-17 18:02:43 +00:00
Robson Richards
637c3f7f63 Fixes for @Aranclanos 
Diseases now have a requires and a required_limb variable
if requires is 1 then it will run a check for required_limb (WHICH USES TYPEPATHS)

Reverts a turret change that git through into the pull for some reason

added some feedback messages in certain places

removed the hulk-like snowflake check that was really crappy anyways

Reworked a part of surgery/surgery_step.dm to use a switch
 2013-11-16 18:13:41 +00:00
Kyrah Abattoir
bded9d1bf6 Merge branch 'master' into vending-reloadedB 2013-11-15 21:58:27 +01:00
Kyrah Abattoir
e11b05416b New system based on restocking points rather than fixed inventory. 2013-11-15 01:04:32 +01:00
Cheridan
16b2bc833f Merge pull request #1753 from Giacom/tele_sci_tweak 
Telescience Update
 2013-11-14 15:30:01 -08:00
Giacomand
0824bbd599 * Tidied up the code. 
* Changed some code to use the teleport datum features.
 * Fixed a broken check in the teleport datum.
 2013-11-12 19:49:36 +00:00
Cheridan
eb3a4e80ad Merge pull request #1747 from YotaXP/NanoUI-APC 
Implements NanoUI for APCs
 2013-11-11 11:38:36 -08:00
YotaXP
139d045b0c Implements NanoUI for APCs, and make a couple other tweaks to the NanoUI framework. 
AI can also toggle the APC lock for human access.
 2013-11-09 22:02:06 -05:00
Giacomand
fbd79a6c02 Initial commit for telescience which uses projectile trajectory to obtain a destination coordinate. 2013-11-09 13:02:15 +00:00
Cheridan
c46fd846ce Merge pull request #1652 from Perakp/securityClothing 
Security clothing crate
 2013-11-06 15:12:36 -08:00
Cheridan
c0566016d5 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/1701 2013-11-06 11:03:40 -06:00
Aranclanos
cc6308e3ce Merge pull request #1695 from Giacom/wiz_jaunt 
The ethereal jaunt holder object will now eject it's contents when deleted
 2013-11-06 07:50:13 -08:00
Cheridan
729dea43a2 Fixes up the implant removal messages, replaces names with paths in uplink_item.dm 2013-11-04 09:58:04 -06:00
Cheridan
4c14b424d6 -Adds an exclusion list to uplink datums. Previously, if you wanted to exclude an item from just one mode, you would have needed to list ALL other modes; hindering maintainability and generally being a pain. 
-Mauler primary weapon replaced with the machine gun. I would prefer to replace this with a single-shot heavy cannon at some point in the future.
-Adds Gygax as a light exosuit option.

-Map edit, adds the nuke op TC consoles and updates the ops staging area.
 2013-11-03 21:06:39 -06:00
Cheridan
637e7f72c9 Nuke Op Population Scaling and Content Update 
to be edited
 2013-11-03 16:41:57 -06:00
sirbayer
c6c1dbd363 Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-improvedprojectiles 2013-11-01 20:32:04 -07:00
Giacomand
1b6233f728 The ethereal jaunt holder object will now eject it's contents when deleted. 
Ethereal jaunting will no longer let you keep moving while you are reappearing.
 2013-11-02 01:06:05 +00:00
sirbayer
6cb100382c Removed potential runtime from spawning projectile/shotgun. Also made it so shotguns actually load shotgun shells. 2013-11-01 14:45:36 -07:00
Robson Richards
a9b725db2f Lot's of stuff, Read full Commit log 
Cybernetic limbs
Multi-location operations
Limbs have sprites now (They never dropped before so it was irrelevant)
No Organic healing of Robotic limbs (But the message is still there, fixing soon)
No "organic" diseases in Robotic areas
No more operations in robotic areas - Cheer's Pete for the surgery system being so nice
Healing Robotic limbs with welders (brute) and cable (burn)
Probably other things I forget
 2013-11-01 19:44:07 +00:00
sirbayer
19e51caef0 Modification of .gitignore to include admins.txt. Hopefully.` 
Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles

Conflicts:
	config/admins.txt
	data/investigate/singulo.html

I don't what I'm doing

Massive overhaul to automatic gun functionality, intended primarily to
allow partially-filled magazines to be released.

Now it compiles and doesn't throw runtimes! Also chambering rounds works
right! Unfortunately the contents still need to be looked at, the Russian
Revolver isn't working, and the Bartender's shotgun is just a nightmare.
Also you still can't eject mags.

Mags eject, most gun work. Shotguns still have a problem with reloading
and chambering. Russian Revolver is a bitch.

Heavy finalizing touches. Fixed references to changed trees. Added
icon_states for some magazines. Fixed revolver glitches and subtyped
double-barreled shotguns to revolvers to fix its glitches. Made bullets
and spent shells more obvious via graphical changes. Probably did some
other things but I can't think of what they'd be.

Sprite tweaks for final preparations for pull request.

final FINAL finalizations.

Adding full paths to overwritten procs for simplicity's sake.

Fixing damaged .gitignore and config/admins.txt.

Finalization for pull preparation. Clean up some descs, eliminate data folder.
 2013-10-30 17:56:00 -07:00
Aranclanos
033248d216 Merge pull request #1648 from Giacom/field_gens 
Field Generator/Containment Field Changes [MAP] (Fixes #205)
 2013-10-30 04:29:19 -07:00
Perakp
37ada07863 Adds the blue versions of fashionable security outfits and a crate you can order from cargo that contains 2x officer, 1x warden and 1x HoS outfits. Crate cost 30 supply points is more than standard costume (10 points) and wizard costume crates (20 points), and cheaper than loyalty implant crate (40 points). 
Also moves around security clothing items. For example HoS clothing was all in clothing/under/jobs/security, now every piece is in their respective category (under, suits, head). This doesn't change item paths.

Spelling fix in icons/mob/suit.dmi
 2013-10-27 11:37:48 +02:00
Cheridan
daf95630c7 Merge pull request #1625 from Malkevin/cultbugs 
Improved word attainment for Cult
 2013-10-26 12:41:18 -07:00
Giacomand
cb2e703844 * Dead bodies won't cause fireball to trigger anymore. 2013-10-25 17:12:03 +01:00
Giacomand
84248eb6ab Made containment fields shock you when you walk into them, not when you walk near them. 
Field generators, that are active, will now shock you; they did before but it was because of the containment field near it.
Changed the type path of the field generator and containment field:

/obj/machinery/field_generator -> /obj/machinery/field/generator
/obj/machinery/containment_field -> /obj/machinery/field/containment

Changed the map to have the new type paths.
The containment field will now shock you when it is created.
The containment field layer is a little above objects, so objects going through are under the field icon.
Cleaned up a bit of the code.
 2013-10-25 15:01:04 +01:00
Malkevin
83dfbcc526 Merge branch 'master' of https://github.com/tgstation/-tg-station into cultbugs 2013-10-23 00:10:03 +01:00
Malkevin
c85648853b Improved word attainment for Cult 
mind.dm - Added a known words list to the mind datum

cult.dm
-**REDUCED RECOMMENDED_ENEMIES BACK DOWN TO 3** - this was one of those band aide fixes we tried ages ago, I really don't feel cult needs more than 3 starting cultists now. Power of three and all that.
-Cultists get a message when grant_runeword gives them the last rune word
-Remove_cultist nullifies the new cult_words mind list on deconversion (Coming Soon™)

runes.dm
-Convert will now try up to three times to give the converter a new word (in testing this seems plenty to get most of the words)
-Sacrifice is now guarenteed to give a new word if the normal checks are passed for a word to be given
-Sacrificing the sacrifice target will reward the sacrificer with up to three words, previously they got fuck all.
-Upped the probablity for words to be given
--Live humans will always give a word
--Dead humans has been increased from 40 to 60
--Monkeys have been increased from 20 to 30
 2013-10-23 00:09:17 +01:00
Aranclanos
dd281bb6b2 Merge pull request #1561 from RobRichards1997/11/10/2013-Limbs-are-Objects 
Changes Limbs into Objects [Merge/Give Feedback]
 2013-10-22 00:41:09 -07:00
Cheridan
9204599fe8 Merge pull request #1597 from Giacom/misc_getrev 
Added revision dates to getrev
 2013-10-18 23:43:04 -07:00