cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-11 01:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,379 Commits 60 Branches 14 Tags
481cc07dcf69a963bfdcf6bc7901c3b4408dfaa6
Commit Graph

18495 Commits

Author SHA1 Message Date
Mervill
481cc07dcf m_intent now uses defines 2016-12-03 00:25:44 -08:00
Mervill
c2e2440953 Merge branch 'master' into w_class 
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
 2016-12-02 21:44:24 -08:00
Jordie
ca6ffdba40 Merge pull request #21866 from Mervill/slashes_deux 
Remove slash from end of type refs/defs
 2016-12-03 15:56:10 +11:00
Jordie
047f885069 Merge pull request #21869 from Mervill/ventcrawler 
Ventcrawler var now uses a define for it's options
 2016-12-03 15:56:02 +11:00
Mervill
19513c398c updates 2016-12-02 19:38:02 -08:00
XDTM
f38469b997 Easy peasy fix (#21878) 2016-12-02 14:17:44 -05:00
Joan Lung
0fc959d694 Improves Geis binding resist (#21846) 
* Improves Geis binding resist

* rrrrgh

* FINE LIMIT IT OKAY
 2016-12-02 12:56:31 +01:00
Cheridan
06242ab811 Merge pull request #21865 from ExcessiveUseOfCobblestone/patch-5 
Fixes Revolver not being able to be redescribed
 2016-12-02 05:02:17 -06:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Cheridan
5f4eb139e6 Merge pull request #21868 from Mervill/quicklint 
Quick code lint
 2016-12-01 23:04:56 -06:00
Cheridan
cae7ac9466 Merge pull request #21859 from XDTM/BlueFix 
Fixes bluespace golem's teleport
 2016-12-01 23:00:03 -06:00
kevinz000
79ff9a8f0b [READY]Lollipops, gumballs, and a cyborg module that shoots them out! (#21782) 
* lollipop

* ...

* Update snacks_other.dm

* Update snacks_other.dm

* Update snacks_other.dm

* Update snacks_other.dm

* stuffs

* itallworksnow

* updates

* mfw kor caught me

* wew

* completed.

* sprites

* thisshouldworkmaybeprobablyidunno

* ...

* Update robot_items.dm

* projectiles

* Update robot_items.dm

* ...

* fuckingnames

* Update robot_items.dm

* .

* ..

* ...

* spamchecking

* ..()

* ..

* ..

* ..

* Update robot_items.dm

* defines refines 2

* Update robot_items.dm
 2016-12-02 15:42:51 +13:00
oranges
a64f7a9df1 Merge pull request #21862 from kevinz000/refines-my-defines 
optimumtact commented an hour ago: CHERI, THEY DIDN"T USE THE DEFINE
 2016-12-02 15:42:07 +13:00
MrStonedOne
b29f1eb067 Makes using the cheat engine to remove darkness or ai static harder 2016-12-01 14:38:28 -08:00
Cheridan
89d3752276 Merge pull request #21584 from RemieRichards/swarmer_boss 
Adds a new boss: Swarmer Swarm [Now a Ruin]
 2016-12-01 07:47:54 -06:00
Kyle Spier-Swenson
95ea967a7b Admins can bypass webclient block 
There is always the DD dropdown to flat out disable the webclient
 2016-12-01 00:31:19 -08:00
Joan Lung
a5ae025549 Replaces "specflags" with "species_traits" (#21851) 
* Replaces "specflags" with "species_traits"

* this will do
 2016-12-01 21:16:33 +13:00
oranges
11029c86de Merge pull request #21853 from ExcessiveUseOfCobblestone/areyouokgrab 
Fixes CtrlClicking Grab Exploit
 2016-12-01 21:09:44 +13:00
Mervill
726a527244 Ventcrawler var now uses a define for it's options 2016-11-30 20:28:04 -08:00
Mervill
d83f68ee66 das ist verboten 2016-11-30 20:08:24 -08:00
Mervill
01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
ExcessiveUseOfCobblestone
b30d0a5782 Fixes Revolver not being able to be redescribed 
/obj/item/weapon already cover this so not sure why the revolver had its own.
 2016-11-30 21:25:23 -05:00
kevinz000
544060f527 return 01010101 2016-11-30 15:48:27 -08:00
oranges
ca894aa845 Merge pull request #21801 from Cyberboss/CloseTheDamnThings 
MC/SS Shutdown. Tguis now close on world reboot
 2016-12-01 12:12:38 +13:00
Cheridan
2102859506 Merge pull request #21813 from kevinz000/fuck_v2 
[READY]Probably will fix hostile flying mobs not attacking people
 2016-11-30 16:51:49 -06:00
XDTM
800e0777be fix 2016-11-30 22:30:49 +01:00
MrStonedOne
c1f8543487 Adds some dropdown options to lists 
I was gonna make it so you could mark lists, but too much code assumed they had a .type and adding the proper istypes to them was too bloaty.
 2016-11-30 12:50:16 -08:00
MrStonedOne
13e781a308 Some shitcode tried to escape. @Shadowlight123 caught it. 2016-11-30 12:50:16 -08:00
MrStonedOne
c4b9c0fe55 Fixes modifing null values with (e) not working. 2016-11-30 12:50:16 -08:00
MrStonedOne
f5f9a75736 Makes the proccall admin verbs use the vv input grabber procs 2016-11-30 12:50:16 -08:00
MrStonedOne
fa6209f691 >trusting admins 2016-11-30 12:50:15 -08:00
MrStonedOne
1f8d998600 Improvements and fixes 2016-11-30 12:50:15 -08:00
MrStonedOne
76e1c6916f VV refactor 2016-11-30 12:49:21 -08:00
oranges
1248245ab2 Merge pull request #21835 from KorPhaeron/buildyourownshuttle 
Syndicate Base Fixes
 2016-12-01 09:23:49 +13:00
Razharas
364964b5d5 Merge pull request #21818 from Thunder12345/tankplsgo 
Added Anti-armour Launcher
 2016-11-30 18:13:47 +04:00
Thunder12345
cfd947f02c Reeeeeee 2016-11-30 14:08:26 +00:00
Thunder12345
15fac9496d Changed name by order of Razharas 2016-11-30 13:54:25 +00:00
Mervill
b5578df27d corrects some defs without leading slash (#21843) 2016-11-30 20:05:14 +13:00
oranges
1f8546bbaa Revert "carbon mob bullet act now checks it's target zone exists before continuing" (#21825) 2016-11-30 00:28:53 -05:00
ExcessiveUseOfCobblestone
e6ffc1cf57 citrus still not happy, must make happy 2016-11-29 23:09:47 -05:00
ExcessiveUseOfCobblestone
185ed7400b makes citrus happy 2016-11-29 23:08:15 -05:00
ExcessiveUseOfCobblestone
f7be2bb768 Praise 2016-11-29 22:49:42 -05:00
Joan Lung
401c35da74 Merge pull request #21822 from XDTM/PlasmaGolemsBurn 
Splits the RESISTTEMP flag, some minor changes to golems.
 2016-11-29 21:39:49 -05:00
Joan Lung
410fd08432 Merge pull request #21824 from erwgd/PmanRandNameFix2 
Fixes plasmamen spawning with no name
 2016-11-29 21:36:39 -05:00
Cheridan
f77841a011 Merge pull request #21811 from GunHog/No_One_Escapes_His_Tiny_Prick 
Fixes Syndicate Medical Cyborg Penetration
 2016-11-29 20:08:10 -06:00
Cheridan
0d3fdf5dfb Merge pull request #21804 from AdamElTablawy/patch-13 
gives syndimedborg a fucking medigun so it's not useless
 2016-11-29 16:51:56 -06:00
oranges
3002e8c9be Merge pull request #21796 from Cyberboss/AirlockElectraccess 
Fixes roundstart airlocks not properly generating airlock electronics access list
 2016-11-30 09:05:24 +13:00
Cheridan
83e77fe49a Merge pull request #21810 from MrPerson/his_coconut_gun_fires_in_spurts_if_he_shoots_ya_its_gonna_hurt 
Snack trash generation rework
 2016-11-29 13:32:05 -06:00
Joan Lung
d44fa2b144 Merge pull request #21812 from Mervill/gasfilter 
Add 15 height to the Gas Filter UI to remove scroll bar
 2016-11-29 13:33:46 -05:00
Thunder12345
d37e339876 Does the oranges and the Joan 2016-11-29 11:03:18 +00:00