cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-08 15:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,787 Commits 63 Branches 14 Tags
91ecb5a6030232e18b2bbc58b59da2802e8aa48a
Commit Graph

4299 Commits

Author SHA1 Message Date
KorPhaeron
91ecb5a603 Fix for the fix 2016-02-09 23:31:34 -06:00
KorPhaeron
2566e424b3 Fixes, special effects for whip and carp 2016-02-09 23:14:50 -06:00
KorPhaeron
d25e113ecc Removes unused defines 2016-02-08 11:15:45 -06:00
KorPhaeron
c2b77be84b Better list/choosing of holy weapons 2016-02-08 11:12:33 -06:00
KorPhaeron
66f8d450ac Chaplain weapon code cleanup 2016-02-06 12:10:48 -06:00
KorPhaeron
d27268f094 Grammar fixes, adds carp-sie plushie 2016-02-04 17:58:47 -06:00
KorPhaeron
d226b82a8d attack_self, not attack_hand 2016-02-03 14:05:05 -06:00
KorPhaeron
8c7b15c87e Uses attackhand for weapon reskin, adds fedora 2016-02-03 13:46:39 -06:00
KorPhaeron
08fc1faf47 Adds three more chaplain weapons 2016-02-03 13:18:37 -06:00
KorPhaeron
f1981271b6 Adds defines for holy weapons 2016-02-03 12:42:37 -06:00
KorPhaeron
59b158bf4b Chaplain Weapons 2016-02-03 12:09:28 -06:00
duncathan salt
0915bcf78c Merge pull request #15068 from PKPenguin321/fuckgitwithacarrot 
carrot shivs strike back
 2016-02-02 19:04:20 -06:00
tkdrg
fbb207a61e Merge pull request #15110 from KorPhaeron/AI_fix2 
Fixes surveillance software
 2016-02-01 19:44:55 -03:00
tkdrg
f9885841f1 Merge pull request #15074 from Chiefwaffles/Slipocalypse 
Adds Uplink Soap Clusterbang for 6TC
 2016-02-01 00:01:33 -03:00
tkdrg
90e4457bf2 Merge pull request #15087 from TrustyGun/eroticroleplay 
Adds Gag Handcuffs
 2016-01-31 20:41:48 -03:00
tkdrg
5b74ac82d7 Merge pull request #15031 from Fayrik/riseofthemachines 
Adds pAI Control to Simple Robots
 2016-01-31 19:02:52 -03:00
Chiefwaffles
170b592377 Ups price to 4TC. Soap Spawnergrenade added to replace soap as payload. 2016-01-31 12:29:00 -08:00
Fayrik
a674179746 Now using attack logs for pai history. PAI to pAI. Removed unnecessary spacing on if statements. 2016-01-31 19:29:36 +00:00
TrustyGun
5bbb78024f Removed all instances of the handcuffs from the map and added them to the arcade machine 2016-01-31 14:15:44 -05:00
tkdrg
da056af83f Merge pull request #15018 from LanCartwright/fungaltbchange 
removes fungal tb from traitor
 2016-01-31 11:36:06 -03:00
TrustyGun
f6c1b49af0 Best of both sides 2016-01-31 03:02:54 -05:00
KorPhaeron
893863daa4 AI Fix 2016-01-31 00:00:04 -06:00
Fayrik
b9162fbb3e Tweaked card ejection slightly. 2016-01-31 00:25:51 +00:00
Akke
f0ef994da6 adds a nerf too 
removes box
 2016-01-30 19:42:13 +00:00
Remie Richards
43f9c228de Merge pull request #15042 from ChangelingRain/swarmoverlays 
Fixes a few things to use temporary overlays
 2016-01-30 18:39:56 +00:00
TrustyGun
e182cf0f2e Makes it more clearer these are meant for pranks 2016-01-30 12:18:21 -05:00
TrustyGun
6f63e74f34 Adds Gag Handcuffs 
They act like regular handcuffs, but you can break out of them in only a
second. One spawns in the Captain's locker and the dorms.
 2016-01-30 11:54:51 -05:00
tkdrg
a0f7d7afe1 Merge pull request #14999 from KorPhaeron/AI_buffs 
AI upgrade software
 2016-01-30 10:50:05 -03:00
KorPhaeron
337f24d14f Moved to its own dm file 2016-01-30 07:29:19 -06:00
KorPhaeron
727db8a4f4 Some span classes and typo fixes 2016-01-30 07:12:58 -06:00
Chiefwaffles
efa5d2577b Adds Slipocalypse Clusterbang for 2tc. 2016-01-30 00:58:51 -08:00
PKPenguin321
1b4b672af9 carrot shivs 
git went rough on my ass and im not happy about it
 2016-01-29 22:05:47 -08:00
tkdrg
b2688de3a2 Merge pull request #15022 from optimumtact/adminsgettingspammedtheymightbanus 
Don't message admins when a grenade goes bang
 2016-01-29 23:32:25 -03:00
xxalpha
06dbea0d5f Merge remote-tracking branch 'upstream/master' into blueprintsarea 2016-01-30 01:29:26 +00:00
xxalpha
e3670adb02 area/setup() 2016-01-30 01:28:44 +00:00
Nerd Lord
7feff1605f get turf not loc 2016-01-29 14:12:17 -05:00
Nerd Lord
a401975b0e Fixes a few things to use temporary overlays 2016-01-29 14:02:41 -05:00
oranges
34bdee117d Don't message admins when a grenade goes bang 
Keeps it in the game log though (for investigations)
 2016-01-29 01:32:30 +00:00
Razharas
0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs 
Absolute paths and changes one liner if's/else's/else if's.
 2016-01-29 03:15:12 +03:00
tkdrg
0dda9b993b Merge pull request #14930 from Shadowlight213/Janiborglightbuff 
Greatly decreases janiborg light replacer refill time.
 2016-01-28 19:30:16 -03:00
Bjorn Neergaard
f93822c195 Allow tgui input() to be 0, fix SMES components 
Fixes #14965
 2016-01-28 07:10:37 -06:00
KorPhaeron
20731df76b Embarrassing Fix 2016-01-28 00:54:54 -06:00
KorPhaeron
9beeea758f Unterminated text 2016-01-28 00:46:54 -06:00
KorPhaeron
00f84f74ea AI upgrade software 2016-01-28 00:44:45 -06:00
Firecage
d82f970234 Merge conflict fix 2016-01-27 17:38:42 +02:00
duncathan salt
fd6482f8cb Merge pull request #14905 from Razharas/Assembly 
Some assembly requaired
 2016-01-27 08:03:00 -06:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard
d9162b653c Fix tgui recursion being broken 
..() is more elegant after all... You win @RemieRichards
Fixes #14925
 2016-01-27 00:52:22 -06:00
xxalpha
d9a7a55649 Fix some cases not detecting a corner wall. 
Fixed it

Clean
 2016-01-27 03:49:09 +00:00
Shadowlight213
3a1411b3bb Greatly decreases janiborg light replacer refill time. 2016-01-25 23:31:02 -08:00