cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-03 05:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,542 Commits 60 Branches 14 Tags
3c8b98a3aabf7b384acbfb4b00a13dc89e22dac8
Commit Graph

8412 Commits

Author SHA1 Message Date
PJB3005
8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
Cyberboss
b9b05af70e || -> && 2017-02-08 00:42:45 -05:00
kevinz000
0ced9342b9 [READY]Aimable wizard lightning bolts (#23723) 
* ZAP!

* YOU DID NOT SEE THAT

* YOU DI NOT SEE THAT 2

* object orientated pr

* gdi

* protection

* object orientated pr v2

* REEEE

* blacklists

* Update magicarp.dm
 2017-02-08 18:31:52 +13:00
Jordie
ae5ca631f8 Watchlist entries filtering, non-deleting messages (#23737) 
* adds watchlist filtering to online clients, messages no longer delete self

* message-sent > message sent

* missed var
 2017-02-08 18:30:51 +13:00
oranges
f360005e37 Merge pull request #23703 from coiax/borg-module-tweaks 
Standard and engineering module tweaks
 2017-02-08 18:23:13 +13:00
oranges
e56743458e Merge pull request #23629 from XDTM/TheLAW 
Adds a Law Removal Module, other minor law changes
 2017-02-08 18:21:26 +13:00
Joan Lung
3d32ed0bdd Merge pull request #23747 from Cyberboss/patch-15 
[s]Fixes race condition with unreadying at start
 2017-02-07 12:28:30 -05:00
Cyberboss
5b7e4af612 Makes simple_animals deathgasp (#23716) 
* Allows simple_animals to have specific emote text

* Makes simple_animals deathgasp
 2017-02-06 18:30:17 +13:00
Cyberboss
bcc72f6d8a Fix carding an AI not stopping the doomsday device (#23725) 2017-02-05 21:36:33 -06:00
Cyberboss
d260d79fc6 Fixes race condition with unreadying at start 2017-02-05 12:15:01 -05:00
Cyberboss
b86e224571 Makes qdeleted and qdestroying macros (#23666) 
* Makes qdeleted and qdestroying macros

* Makes QDELETED and QDESTROYING uppercase

* Swap qdel checks istype's for != null's

* Fix it

* How was this missed?
 2017-02-06 00:59:27 +13:00
Jack Edge
241d9d2100 Standard and engineering module tweaks 
🆑 coiax
add: Added metal rods and floor tiles to Standard cyborgs.
add: Added a remote signaling device to Engineering cyborg.
/🆑

- I also broke up the list of modules so now it's a single line per
module, which makes it a little more readable and inline with other
large lists that exist in the codebase. This is why there are so many
line changes.
 2017-02-04 22:32:11 +00:00
Joan Lung
246b1fd253 Merge pull request #23671 from KorPhaeron/eyes_as_organs 
Eyes As Organs
 2017-02-04 17:14:19 -05:00
Joan Lung
7fa4ee825a Merge pull request #23659 from Cyberboss/thisisstupid 
AIs can no longer resist
 2017-02-04 12:55:34 -05:00
Joan Lung
027290de05 Ratvar-converted AIs become brass-colored, speak in Ratvarian, and cannot be carded (#23664) 
* Ratvar-converted AIs become brass-colored, speak in Ratvarian, and cannot be carded

* bro you're super rogue

* that'd be smart
 2017-02-04 11:34:51 -06:00
KorPhaeron
8f5b9a3aa0 It should probably actually compile 2017-02-04 08:38:06 -06:00
KorPhaeron
0117b71d48 Lazy nightvision spell is no longer meant for carbons to use 2017-02-04 08:36:17 -06:00
KorPhaeron
3d5443212b Fixes a runtime 2017-02-03 21:58:45 -06:00
KorPhaeron
71e958b44e Eyes travel with the head when dismembered 2017-02-03 19:13:47 -06:00
Pieter-Jan Briers
aeb057579e Hey it almost works 2017-02-04 01:00:12 +01:00
KorPhaeron
f50e88c16f Gives aliens, shadowpeople, monkeys, devils eyes 2017-02-03 17:34:34 -06:00
KorPhaeron
9745224888 Eyes As Organs 2017-02-03 15:38:26 -06:00
Joan Lung
4c71b31f6f Merge pull request #23616 from KorPhaeron/flashlight_eyes 
Flashlight eyes
 2017-02-03 15:03:30 -05:00
Cyberboss
7cc193a2de AIs can no longer resist 2017-02-03 09:56:09 -05:00
Leo
5c35f47598 Improves the sql death report (#23513) 
* Adds the map name and server to the death report.
Removed the `sql_report_cyborg_death()`, it was the same as `sql_report_death`.

* Changes the SQL schemas.
 2017-02-03 10:36:31 +13:00
oranges
52df5eadb5 Merge pull request #23586 from KorPhaeron/removesdumbvar 
Removes weakeyes
 2017-02-03 00:28:46 +13:00
oranges
236c9e4799 Merge pull request #23554 from ChangelingRain/scriptureswap 
Swaps the tier of Vitality Matrix and Fellowship Armory
 2017-02-03 00:21:21 +13:00
XDTM
eb5086a307 Misc law changes 2017-02-02 12:18:49 +01:00
kevinz000
910a986dbe Removes the changeling test (#23592) 
* Update brain_item.dm

* Update dismemberment.dm

* Update brain_item.dm

* Update brain_item.dm
 2017-02-02 11:45:21 +01:00
Cyberboss
a6384a1240 Fixes PAI cards sticking around after holoform (#23591) 2017-02-02 11:43:52 +01:00
XDTM
fbe6cfe55d Fixes exotic_blood not being deleted (#23564) 2017-02-02 11:32:46 +01:00
KorPhaeron
78a1902b46 Flashlight Eyes 2017-02-01 19:06:41 -06:00
Cyberboss
5efe9764ee Actually fixes monkeys runtiming (#23602) 2017-02-01 20:34:28 +01:00
Leo
99dfc8777c Fixes monkeys runtiming (#23593) 2017-02-01 13:12:13 +01:00
KorPhaeron
b550f76ade Readds code that shouldn't have been removed 2017-01-31 21:41:25 -06:00
KorPhaeron
e850988a80 Removes weakeyes 2017-01-31 21:38:49 -06:00
oranges
7a9b7ffe2f Merge pull request #23503 from ChangelingRain/eyewearfix 
Fixes glasses toggling
 2017-02-01 15:56:31 +13:00
Cyberboss
f11c339ebc Make progress bars stack vertically (#23516) 
* Make progress bars stack vertically

* Move progress bars to the HUD layer
 2017-02-01 15:54:52 +13:00
KorPhaeron
1cca4cb56e Fixes the secret monkey technique (#23457) 
* Fixes the secret monkey technique

* Fixes spacing
 2017-02-01 15:47:22 +13:00
Joan Lung
746d94bc6f Merge pull request #23531 from Cyberboss/DRONES 
Fixes drone inventories
 2017-01-31 12:15:16 -05:00
Joan Lung
29e8ce0141 Swaps the tier of Vitality Matrices and Fellowship Armory 2017-01-31 11:57:54 -05:00
oranges
3db7886ed7 Merge pull request #23459 from ChangelingRain/cyborgscriptureselection 
Tweaks Servant cyborg loadouts
 2017-01-31 22:01:59 +13:00
oranges
b60e3b00c4 Merge pull request #23479 from MrStonedOne/patch-297 
Fix walk/run not toggling properly.
 2017-01-31 22:01:05 +13:00
Cyberboss
1ce934cdd9 Fixes drone inventories 2017-01-31 01:09:41 -05:00
Cyberboss
3f7f5d4000 Removes/Refactors /mob/unEquip (#22918) 
* Part1

* IT COMPILES!!!!

* Fuck wait this was missing from that last

* Update handlabeler.dm

* Update handlabeler.dm

* Fixes n shit

* Fix this

* Fixes #23310

* Fucking @RemieRichards was right

* Fixes devil unEquip

* WTF ARE BITFLAGS?

* THERES THE FUCKING PROBLEM

* Fixes
 2017-01-31 09:28:31 +13:00
oranges
108dd4a460 Merge pull request #23437 from ChangelingRain/alienweeds 
Fixes something doing a locate in world
 2017-01-31 09:21:12 +13:00
Cyberboss
f7c9749ca0 Fixes some bad addtimer calls. Adds INVOKE_ASYNC. Replaces addtimer(..., 0) (#23424) 
* Fixes some bad addtimers

* Adds INVOKE

* Warning for addtimer

* Working syntax

* Another bad call

* Fixes the addtimer warning

* Add suppress_zero_warning to addtimer

Useful for addtimer that uses vars

* Add INVOKE_AGAIN for when the var is already defined

* Replace addtimer(...,0) with INVOKE((...))

* Much more sensible syntax

* Less overhead, less copypaste

* Rename INVOKE_ASYNC

* Use a macro

* Allman style

* Wait, why make it a datum in the first place?

* Revert the rename

* Rename again, keep line endings

* typo

* More typos

* Untouches Addtimer

* Update callbacks.dm

* Update timer.dm

* Revert allman style

* Revert "Revert allman style"

This reverts commit 47361da15bd04eca138be5f13acdc9dd5ba89331.

* Trying to match that whitespace diff

* Why is this missing?

* I'm not fucking dealing with this!
 2017-01-31 09:20:54 +13:00
oranges
de19dfc066 Merge pull request #23382 from Core0verload/intents_for_animals 
Adds support for simple mobs changing intents
 2017-01-31 09:13:19 +13:00
Joan Lung
0fbde400e5 Fixes glasses toggling 2017-01-30 11:31:00 -05:00
Kyle Spier-Swenson
e0e5b0aac5 Fix walk/run not toggling properly on alt tab. 
Basically, if you press and release alt within 1 game tick, the latter is ignored because of byond's verb limits. this fixes that.
 2017-01-29 16:00:54 -08:00