cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 21:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,961 Commits 61 Branches 14 Tags
38605d1aeee51f1e4b9c364b0b30c6e825252c3c
Commit Graph

556 Commits

Author SHA1 Message Date
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
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
bgobandit
b3b9941432 Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa 
Conflicts:
	code/modules/assembly/flash.dm
 2015-09-09 14:04:41 -04:00
Razharas
93b9f96cfa Merge pull request #11341 from bgobandit/suicideisnotajoke 
Adds/tweaks several suicide messages.
 2015-09-06 06:42:00 +03:00
c0
df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
bgobandit
d23f2cb622 mats for toolboxes, glasses and flashes; adjusts coin amounts up slightly 2015-08-31 12:14:34 -04:00
duncathan
51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
bgobandit
020ea5d262 Adds materials to some items for recycling purposes. 2015-08-30 14:28:56 -04:00
Cheridan
7f0f74f100 Merge pull request #11380 from bgobandit/salicyclicassblastusa 
Fixes burn kits containing salicyclic acid pills. Adds new burn medication.
 2015-08-27 23:53:58 -05:00
bgobandit
6ab2443255 Adds oxandrolone, a new burn medication designed to work upon ingestion. Adds oxandrolone to burn kits. Adds changelog. 2015-08-25 13:46:05 -04:00
bgobandit
132adf3f00 adds silver sulf syringes instead of kelotane pills 2015-08-24 21:45:18 -04:00
bgobandit
ce8722b868 Fixes burn kits containing salicyclic acid pills. 2015-08-24 21:36:50 -04:00
bgobandit
4909600303 Adds/tweaks several suicide messages. 2015-08-23 15:02:34 -04:00
Aranclanos
dd6e735e71 The remove_from_storage() call from handle_atom_del() will stop dropping the objects on null, to avoid having other storage objects with items inside in a null location. 2015-08-21 07:14:56 -03:00
Aranclanos
6f4c89c5ff Fixes the nuclear disk from not spawning under really specific circumstances 2015-08-21 05:22:20 -03:00
Swag McYolosteinen
825b5794c7 Merge pull request #11239 from Firecage/del2qdel 
del() to qdel()
 2015-08-19 11:50:24 +02:00
Remie Richards
7453449531 Merge pull request #10975 from bustygoku/Backpacks-Slotstuff 
Changes Backpack Slotcount to 21
 2015-08-18 20:14:16 +01:00
Firecage
bf13763e3b Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel 2015-08-16 23:34:03 +02:00
Firecage
dfae1e0b53 Changes a lot of del() to qdel() 2015-08-16 23:33:22 +02:00
phil235
df758d2fff Merge pull request #11146 from MMMiracles/biomemes 
Revamps Bioterror Darts
 2015-08-15 22:47:00 +02:00
phil235
bf7dadc538 Merge pull request #11175 from Memendia/master 
Grammar Fix
 2015-08-14 12:25:57 +02:00
Swag McYolosteinen
1142403f32 Merge pull request #11070 from PatchouliKnowledge/awkwardpoisons 
Fixes syndie poison kits not being able to hold what they come with
 2015-08-13 16:33:54 +02:00
Memendia
6b649e583b Grammar Fix 2015-08-12 21:09:39 -07:00
Remie Richards
eedea4d281 Merge pull request #11018 from Core0verload/hammerspace 
New traitor item: storage implant
 2015-08-12 14:45:23 +01:00
MMMiracles
35b78b1209 Revamps bioterror darts into a non-lethal syringe form. Removed the coniine and spore toxin to make it solely for quiet take-downs (in thoery). 2015-08-11 01:56:38 -04:00
Remie Richards
9fb63dbec9 Fixes items that survive a storage container's destruction keeping the storage mouse_opacity 2015-08-07 23:02:28 +01:00
Jordie
63c545346d Merge pull request #10992 from RemieRichards/AlternateWornLayer 
Adds alternate_worn_layer
 2015-08-07 19:37:52 +10:00
PatchouliKnowledge
d80ecd8c74 Fixes syndie poison kits not being able to hold what they come with 2015-08-07 02:44:46 +03:00
bustygoku
c2e9592009 Added Changelog And Fixed Smuggler Satchel And Duffelbag 2015-08-05 13:10:57 -07:00
phil235
4e5be438cd Merge pull request #10990 from RemieRichards/StorageUnequipUsability 
Storage Item Click Usability Improvement
 2015-08-05 00:07:01 +02:00
c0
bd8d70ec26 New traitor item: storage implant 2015-08-04 18:28:38 +03:00
Jordie
d5a88d3f98 Merge pull request #10957 from Core0verload/surgery-organs-implants 
Implants, Surgery and Organs rework: Phase 1
 2015-08-04 21:45:02 +10:00
Remie Richards
db22dd672e Merge pull request #10962 from Core0verload/weneedtogodeeper 
Removes some annoying inventory tetris with storages in storages
 2015-08-03 17:15:11 +01:00
Remie Richards
af7a671097 Merge pull request #10921 from phil235/StorageThrowFix 
Storage throw runtime fix
 2015-08-03 05:17:50 +01:00
Remie Richards
47fe31346e Adds alternate_worn_layer, like alternate_worn_icon it allows an item to slightly bend the rules of worn item rendering, DOES NOT MODIFY THE STANDING_ICONS INDEXES, BECAUSE THAT WOULD BREAK THINGS 2015-08-02 22:45:18 +01:00
Remie Richards
786709093c Makes it so clicking on the storage window of a storage item (backpack,box) acts as if you clicked the item, removing it from the storage, and equipping it, NO MORE PIXEL HUNTING! 2015-08-02 20:59:02 +01:00
bustygoku
1d0b41b23a Changes Backpack Slotcount 2015-08-01 11:29:59 -07:00
c0
d70acbc7a8 Second level storages are not closing on mob movement 2015-08-01 02:59:06 +03:00
c0
47524811c5 Renamed "glass case" -> "implant case". Changed implant syndiekit to be less FUCKS. 2015-08-01 01:56:54 +03:00
Incoming
e2c39a20f4 RemieRichards wins the technical code semantics fight today 2015-07-30 17:55:35 -04:00
Incoming
248b1f5c96 Syndicate toolboxes now come with insulted gloves (that look like red gloves). Wires are lost as a consequence. 2015-07-30 17:28:11 -04:00
phil235
34651d5390 Fixes a runtime when cigarette packets are destroyed. 2015-07-29 13:37:06 +02:00
phil235
dbd53fbf10 Fixes runtime when obj/item/weapon/storage and facehugger call throw_at() 2015-07-29 13:28:07 +02:00
Jordie
82d964957a Merge pull request #10687 from Steelpoint/OfficerMask 
[FLUFF|BALANCE] Security Officers Sec Breathmask in Internals Box
 2015-07-25 20:19:38 +10:00
Jordie
9b0b4e1aa4 Merge pull request #10710 from xxalpha/cablecoilbackpack 
Fixed storage not updating when joining cable coils.
 2015-07-25 19:12:26 +10:00
xxalpha
8e00cdfe9a Fixed storage not updating when joining cable coils. 
Fixed stack objects not updating storage when deleted.

Added handle_atom_del proc to be called on destroy.

Label comment for handle_atom_del()
 2015-07-22 17:58:05 +01:00
Steelpoint
f4dd5604d6 Commit 2015-07-18 19:39:33 +08:00
Steelpoint
6a3b9ef284 Merge branch 'master' of https://github.com/tgstation/-tg-station into AyylienGun 
Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
 2015-07-16 18:11:33 +08:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Steelpoint
f96fdab622 CuffSprites 2015-07-15 19:38:29 +08:00