cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 20:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,057 Commits 61 Branches 14 Tags
bb668d7ddf5384ce4e1f03253f6ec15c81176d2f
Commit Graph

1762 Commits

Author SHA1 Message Date
Swag McYolosteinen
3ef5d02cee Merge pull request #11689 from Steelpoint/RifleS 
Security Weapon Overhaul: Auto Rifle Edition
 2015-09-16 13:34:35 +02:00
Steelpoint
e51eefbe34 MoreChanges 2015-09-16 18:00:21 +08:00
Razharas
73db85100c Merge pull request #11769 from phil235/FixMutations 
Some dna fixes
 2015-09-15 22:31:59 +03:00
Cheridan
037bce50c2 Merge pull request #11772 from xxalpha/fixthelathe 
Fix autolathe rejecting stacks.
 2015-09-15 08:01:59 -05:00
Cheridan
0a8690edf0 Merge pull request #11738 from Supermichael777/detomax 
Buffs the detomax pda bomb by removing its RANDOM EXPLOSION MECHANIC.
 2015-09-14 18:37:53 -05:00
phil235
2333eb6b55 Merge pull request #11763 from RemieRichards/FootprintTweaks 
Footprint Tweaks
 2015-09-14 20:50:23 +02:00
phil235
c9588662f7 Removed generate_uni_identity from randomize_human() proc since it's already called by ready_dna right after. 
Simplifies mutation overlay updating code.
 2015-09-14 00:58:25 +02:00
xxalpha
0a055f101a Fix material container 2015-09-13 23:35:49 +01:00
phil235
428a28a440 Fixes monkeyize/humanize removing the mob's viruses when they should be kept. 
Fixes NOCLONE and CLUMSY being in both disabilities and mutations. they're now only disabilities.
Fixes minttoxin not gibbing people with the fat disabilities.
Fixes some runtimes, replacing usr by user in some places.
Fixes mutation overlays being removed when updating overlays.
Remove the now unused mob/var/list/mutations and human/var/blood_type
Fixed some formatting in preferences.dm
 2015-09-13 22:52:38 +02:00
Remie Richards
4bb97067b2 Tweaks amount of footprints, and fixes some bugs related to footprints, adds shoetype tracking to footprints 2015-09-13 15:36:56 +01:00
Jordie
e718214a67 Merge pull request #11734 from Menshin/sheets_inserting_safety_checks 
Adds boundary checks for stack sheets inserting
 2015-09-13 23:13:04 +10:00
Steelpoint
5783cdda03 Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-09-13 20:00:41 +08:00
Jordie
15e50de0fe Merge pull request #11694 from bear1ake/point-zero 
Remove a bunch of useless .0 in vars
 2015-09-13 21:47:09 +10:00
Jordie
2ca388bf9f Merge pull request #11696 from Shadowlight213/Edswarmfix 
Modifies the Dispense Wizard Justice spell to correct some issues
 2015-09-13 21:44:23 +10:00
Supermichael777
fc07017814 it still costs 6 2015-09-12 12:37:45 -04:00
Supermichael777
3be09cfbd2 lowers detomax cost 2015-09-12 12:19:46 -04:00
bear1ake
c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero 
Conflicts:
	code/modules/research/protolathe.dm
 2015-09-12 21:07:40 +09:00
Steelpoint
ae117c134b Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS 
Conflicts:
	code/game/jobs/job/security.dm
 2015-09-12 18:43:15 +08:00
Menshin
ce2ee15b57 * Added boundary checks for stack sheets inserting (fixes #11732) 
* Limited material inserting to stack sheets for the protolathe and banana shoes
 2015-09-12 12:11:57 +02:00
Razharas
f9a01d1365 Merge pull request #11580 from xxalpha/protocontainer 
Changed protolathe code to use material container.
 2015-09-12 08:56:47 +03:00
Razharas
fbe1781374 Merge pull request #11609 from AnturK/outfits 
Outfit datum
 2015-09-12 08:56:12 +03:00
xxalpha
28889d2b6a Changed protolathe code to use material container. 
Clean proc, typo fix

Standard sheet values
 2015-09-11 12:39:32 +01:00
Steelpoint
5a5bcbbbd7 Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS 
Conflicts:
	code/game/gamemodes/changeling/powers/mutations.dm
 2015-09-10 23:18:39 +08:00
Shadowlight213
ee5022baac Sets Ed projectiles to lasers because Jordie demands justice be death 2015-09-10 05:50:48 -07:00
palpatine213
cde222b8b8 Adds a few vars to the Eds summoned by the wizard justice spell. 2015-09-10 05:26:41 -07:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Steelpoint
6eac77fcfd Rifle 2015-09-10 13:14:41 +08:00
Cheridan
304d91fa2c Merge pull request #11606 from Firecage/gunnames 
This gives most projectile guns less generic names.
 2015-09-09 10:45:18 -05:00
Firecage
b7cbf7f940 Just a name change to uplink items. 2015-09-09 17:38:22 +02:00
Steelpoint
d45890b4df Merge branch 'master' of https://github.com/tgstation/-tg-station into GunsEdition 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-09-09 11:47:44 +08:00
Steelpoint
0e9a6106a3 Crates 2015-09-08 23:53:47 +08:00
AnturK
c2a26c81e7 Adds Create Custom Outfit admin verb 
Sechud fix
 2015-09-08 14:41:15 +02:00
AnturK
b3b18d0080 Job Outfits 2015-09-07 18:13:08 +02:00
Firecage
42a28af718 Updated gun names. 2015-09-07 10:06:14 +02:00
AnturK
1a9b7ad3c0 Admin equipment & ERT outfits 2015-09-07 01:06:09 +02:00
AnturK
ff8063c68c Adds outfit datum 2015-09-06 20:06:10 +02:00
bgobandit
c5984f4359 Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41G.dmm
 2015-09-06 13:27:51 -04:00
Firecage
9c341fb128 This gives most projectile guns less generic names. 2015-09-06 13:43:38 +02:00
Cheridan
73c3e0e4f9 Merge pull request #11536 from Incoming5643/letting_old_threats_lay_fallow 
Reverts #10922: ei nath nerfs 2: ayy lmao
 2015-09-04 22:52:15 -05:00
bgobandit
261494e659 Made some changes and repathing for posters. 2015-09-04 18:30:58 -04:00
c0
df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
Incoming
fcaad005de Reverts #10922: ei nath nerfs 2: ayy lmao 
1. Someone gets salty and tries to grudgecode ei nath away
2. Someone else has to step in and make a nerf that isn't shooting the spell in the knees
3. The salt does not abate and new grudgecode rises
4. Everyone laughs about it and forgets about the pull
5. Months later it gets pulled with no testing and outstanding grammatical errors to the surprise of everyone, including the person who originally grudgecoded it

This is duuuuuuuumb
 2015-09-02 00:26:42 -04:00
palpatine213
00f01159b1 Fixes Merge conflicts 2015-09-01 19:46:30 -07:00
xxalpha
75b2f53ce8 Merge remote-tracking branch 'upstream/master' into crawlinginmyskin 
Conflicts:
	icons/mob/actions.dmi
 2015-09-01 15:39:15 +01:00
Razharas
bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE 
Makes all Destroy() procs return properly
 2015-09-01 15:54:18 +03:00
Razharas
e69d8d312b Merge pull request #11232 from Miauw62/alanedaggerpoe 
Edaggers: Actually works edition
 2015-09-01 11:07:22 +03:00
Razharas
a898794ed1 Merge pull request #10922 from Miauw62/idedthenerfening 
ei nath nerfs 2: ayy lmao
 2015-09-01 10:34:54 +03:00
Razharas
4a4d46305f Merge pull request #11485 from AnturK/knockknock 
Makes knock spell open lockers/crates
 2015-09-01 09:52:02 +03:00
duncathan
48b67e5a25 Merge branch 'master' of https://github.com/tgstation/-tg-station into returnQDEL_HINT_LETMEDIE 
Conflicts:
	code/game/objects/effects/landmarks.dm
 2015-09-01 00:11:33 -06:00
xxalpha
4644e99aa7 Changed bloodcrawl to be a spell. 
Changed blood crawl to be a spell.

BLOOOOD
 2015-08-31 16:24:27 +01:00