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
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
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
c52c4a5346
Merge remote-tracking branch 'tgstation/master' into point-zero
...
Conflicts:
code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
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
f9a01d1365
Merge pull request #11580 from xxalpha/protocontainer
...
Changed protolathe code to use material container.
2015-09-12 08:56:47 +03:00
fbe1781374
Merge pull request #11609 from AnturK/outfits
...
Outfit datum
2015-09-12 08:56:12 +03:00
28889d2b6a
Changed protolathe code to use material container.
...
Clean proc, typo fix
Standard sheet values
2015-09-11 12:39:32 +01:00
ee5022baac
Sets Ed projectiles to lasers because Jordie demands justice be death
2015-09-10 05:50:48 -07:00
cde222b8b8
Adds a few vars to the Eds summoned by the wizard justice spell.
2015-09-10 05:26:41 -07:00
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
304d91fa2c
Merge pull request #11606 from Firecage/gunnames
...
This gives most projectile guns less generic names.
2015-09-09 10:45:18 -05:00
b7cbf7f940
Just a name change to uplink items.
2015-09-09 17:38:22 +02:00
c2a26c81e7
Adds Create Custom Outfit admin verb
...
Sechud fix
2015-09-08 14:41:15 +02:00
b3b18d0080
Job Outfits
2015-09-07 18:13:08 +02:00
42a28af718
Updated gun names.
2015-09-07 10:06:14 +02:00
1a9b7ad3c0
Admin equipment & ERT outfits
2015-09-07 01:06:09 +02:00
ff8063c68c
Adds outfit datum
2015-09-06 20:06:10 +02:00
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
9c341fb128
This gives most projectile guns less generic names.
2015-09-06 13:43:38 +02:00
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
261494e659
Made some changes and repathing for posters.
2015-09-04 18:30:58 -04:00
df7386a4ec
Assemblies update
2015-09-04 11:22:37 +03:00
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
00f01159b1
Fixes Merge conflicts
2015-09-01 19:46:30 -07:00
75b2f53ce8
Merge remote-tracking branch 'upstream/master' into crawlinginmyskin
...
Conflicts:
icons/mob/actions.dmi
2015-09-01 15:39:15 +01:00
bfbe4e997e
Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
...
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
e69d8d312b
Merge pull request #11232 from Miauw62/alanedaggerpoe
...
Edaggers: Actually works edition
2015-09-01 11:07:22 +03:00
a898794ed1
Merge pull request #10922 from Miauw62/idedthenerfening
...
ei nath nerfs 2: ayy lmao
2015-09-01 10:34:54 +03:00
4a4d46305f
Merge pull request #11485 from AnturK/knockknock
...
Makes knock spell open lockers/crates
2015-09-01 09:52:02 +03:00
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
4644e99aa7
Changed bloodcrawl to be a spell.
...
Changed blood crawl to be a spell.
BLOOOOD
2015-08-31 16:24:27 +01:00
608f216b40
Merge pull request #11469 from Cheridan/crushed_it
...
Recycler Tweak Port
2015-08-31 10:07:31 +03:00
51c09f16bf
makes all Destroy()'s return properly
2015-08-31 00:21:01 -06:00
877111b8e6
Removed upgrade mechanics from camera bugs. They come build in with networking, sabotage, and tracking upgrades. Also added camera disable button to track menu.
2015-08-30 17:58:27 -07:00
d1c417e996
Merge pull request #11416 from xxalpha/airlockQDEL
...
Added qdel(wires) to a bunch of objects Destroy proc.
2015-08-31 00:08:27 +03:00
32d74ad19c
Merge pull request #11433 from Core0verload/framed
...
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
31aab1ed56
makes knock open lockers/crates
2015-08-30 17:38:01 +02:00
97b792bbc3
Changed some circuits paths to reduce copypasta
2015-08-30 16:58:13 +03:00
c4a1b0ebdb
Recycler Tweak Port
2015-08-29 17:47:42 -05:00
19947d4fa0
Added qdel(wires) to a bunch of objects Destroy proc.
...
Return ..()
2015-08-27 11:10:58 +01:00
6c40da4c11
Fixes the message of losing the phylactery on the bind to object spell, now it actually shows up.
2015-08-24 04:46:48 -03:00
20e57adf89
Added salt shaker and pepper mill to food crate
2015-08-19 15:16:12 +01:00
825b5794c7
Merge pull request #11239 from Firecage/del2qdel
...
del() to qdel()
2015-08-19 11:50:24 +02:00
9266964f62
Merge pull request #11108 from bgobandit/newcrates
...
Adds forensics and toy crates to cargo.
2015-08-19 19:24:15 +10:00
8c9c59239f
Merge pull request #11168 from oisin100/patch-1
...
Bugfix And Feature addition. Chameleon And Stealth Mutations
2015-08-19 19:04:55 +10:00
166818a67b
Changed String to Definition
2015-08-18 23:53:01 +02:00
0c4f4ccf1e
Merge pull request #11240 from CorruptComputer/thisandthat
...
Deletes computerfiles.dm and minor edit to atoms.dm
2015-08-18 20:36:32 +01:00
c19f72123c
Merge pull request #11227 from phil235/EpilepsyFix
...
Fixes epilepsy mutation leaving you always at super high jitteriness level.
2015-08-18 20:31:23 +01:00
ea84d4f3ce
Merge pull request #11207 from SconesC/belts
...
Adds Military Belts to the standard Uplink
2015-08-18 20:27:58 +01:00
Jordie
bear1ake
Menshin
Razharas
xxalpha
Shadowlight213
palpatine213
Cheridan
Firecage
AnturK
bgobandit
c0
Incoming
duncathan
Cheridan
Aranclanos
erwgd
Swag McYolosteinen
Oisin100
Remie Richards