SparklySheep
496645fc62
Churp
2014-04-11 12:21:28 -05:00
SparklySheep
d12f2570cd
Nurp
2014-04-11 12:15:11 -05:00
SparklySheep
217c3f78a1
Derp
2014-04-11 12:04:16 -05:00
SparklySheep
21cc256945
Hurp
2014-04-11 12:01:33 -05:00
DJSnapshot
da3489196c
Merge pull request #4727 from Ccomp5950/FUCK-say-code
...
Saycode rewrite.
2014-04-10 22:42:38 -07:00
Ravensdale
1d6655850f
Changes all appropriate instances of toxins to phoron
2014-04-10 15:11:26 -07:00
SparklySheep
c355a30cf6
Removes E-bow Instant Stun. Slight tox buff.
...
The E-bow with the stun is currently the most powerful weapon in the game. Stuns on hit, causes immediate damage, unlimited ammo with recharge, and the stun is not affected by armor. You can viably stunlock someone to death just by occasionally shooting them without running out of ammo. Horrible design and it warrants an immediate removal until I finish my E-bow changes later.
2014-04-10 14:41:37 -05:00
Ravensdale
a3e4a43536
Changes most viable, used entries of plasma with phoron.
2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071
Changes all appropriate instances of 'Plasma' to 'Phoron'
2014-04-10 01:19:49 -07:00
Ravensdale
0d589ff569
Changes all instances of PLASMA in active code into PHORON
2014-04-10 00:19:29 -07:00
Ccomp5950
6056b5dc3d
Some fixes saycode cleanups
...
Moved the verb check from hear to the speaker
Spellcheck on hulk so Dragor doesn't beat me up.
2014-04-10 00:05:52 -05:00
Chinsky
06fd99b9ba
Merge pull request #4723 from Jarcolr/diction
...
Fixes some typos and descriptions
2014-04-09 21:48:19 +04:00
Ccomp5950
46704a436b
Saycode rewrite: Add support for speech_problem_flag
...
Ready for Dev
2014-04-08 21:50:01 -05:00
Jarcolr
868dea5681
Grammar patch 1
...
This is just the first one of many.
2014-04-08 14:48:31 +03:00
Ccomp5950
e1fef1796e
Merge pull request #4707 from DJSnapshot/tasers
...
replaced electrodes with insta hit taser beams
2014-04-07 02:16:01 -05:00
Ccomp5950
80bae7a87d
Merge pull request #4705 from DJSnapshot/jumpsuits
...
Undershirts and rolling down jumpsuits!
2014-04-07 02:12:59 -05:00
Ccomp5950
9fb43f2333
Merge pull request #4706 from DJSnapshot/papers
...
Carbonless copy papers
2014-04-07 02:12:10 -05:00
DJSnapshot
86d273e25e
DEBUG TEXT, WOO
2014-04-06 18:31:33 -07:00
DJSnapshot
36b2efd3df
disregard failure. I made a silly.
2014-04-06 18:29:50 -07:00
iamgoofball
238451dbc9
die monkey emergency DIE
2014-04-06 12:05:41 -07:00
RavingManiac
f0bda5a494
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-04-06 14:28:28 +08:00
RavingManiac
e348f532ab
Items inside objects will now hear what the object is hearing, as will items inside those items. This allows tape recorders to work in containers and closets.
2014-04-06 14:20:57 +08:00
Ccomp5950
9d291b79ea
Merge pull request #4695 from mwerezak/dev
...
Made single cable pieces have w_class = 1
2014-04-06 00:16:06 -05:00
DJSnapshot
1a50dddbd4
replaced electrodes with insta hit taser beams.
2014-04-05 17:13:09 -07:00
DJSnapshot
772edffad1
Merge pull request #4700 from Jarcolr/diction
...
Spaghetti isn't called spagetti anymore
2014-04-05 17:05:06 -07:00
DJSnapshot
61036e529e
Merge pull request #4692 from Hubblenaut/master
...
Renamed paperwork no longer has 'paper -' in name
2014-04-05 17:03:48 -07:00
DJSnapshot
4ea07e2617
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into papers
2014-04-05 16:24:56 -07:00
DJSnapshot
7b7f3bcfc0
Undershirts and rolling down jumpsuits!
2014-04-05 16:18:11 -07:00
Mloc
cd23a4b786
Merge pull request #4690 from Glloyd/ear_stuff_2
...
A first pass at more realistic w_class values
2014-04-05 16:23:59 +01:00
Jarcolr
bec699bb7c
Spaghetti isn't called spagetti anymore
...
Didn't change the code/vars/recipes; just fixed the Name line to the
proper spelling.
2014-04-05 18:13:19 +03:00
Mike
fa1fd3cb24
Made single cable pieces have w_class = 1
...
Single cable pieces have w_class = 1 and can be tucked behind the ear.
2014-04-05 01:21:30 -04:00
Hubblenaut
0b29f83444
Renamed paperwork no longer has 'paper -' in name
2014-04-04 22:18:08 +02:00
Ccomp5950
6f55b60120
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
html/changelog.html
2014-04-04 01:14:31 -05:00
Graham Lloyd
72e45ebf7b
A first pass at more realistic w_class values
2014-04-03 17:54:06 -04:00
Mike
353941db7c
APCs that are undersupplied now call cell.give()
...
APCs that are undersupplied now call cell.give() instead of manipulating
cell.charge directly, for better encapsulation.
2014-04-02 23:46:54 -04:00
Chinsky
0bf6708342
Merge pull request #4666 from Ccomp5950/apc_fix
...
APC bugfix after someone messed with mah areas!
2014-04-01 18:17:22 +04:00
Chinsky
26007716e4
Merge pull request #4660 from Jarcolr/patch-2
...
Can no longer use fire extinguisher closet without hands
2014-04-01 16:23:18 +04:00
Ccomp5950
6af132b834
APC bugfix after someone messed with mah areas!
...
This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
and master areas needing power updates call power updates for the each of it's child areas. Also added where messing with SMESes called for an update on all areas power consumption, probably
not required but doing so either way.
We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
update instantly, otherwise wait 5 minutes. The only downside to this 5 minutes is you might get free energy until that area becomes active.
2014-04-01 03:06:58 -05:00
Jarcolr
ffd4afa43d
Also fixes paperbin without hands
...
Whee.
2014-03-31 18:48:57 +03:00
Chinsky
9227823e2c
Merge pull request #4654 from Ccomp5950/Buff_NarSie
...
Lagsie no more, NarSie HUNGERS
2014-03-31 14:57:43 +04:00
DJSnapshot
19db97f9e2
Merge pull request #4650 from Ccomp5950/damn_boulders
...
Oversight, miners can now bump mine boulders just like the rock around them
2014-03-31 00:27:04 -07:00
DJSnapshot
0affa39490
initial CC paper commit. Will continue work on this.
2014-03-30 16:41:06 -07:00
Ccomp5950
bf7684bced
Lagsie no more, NarSie HUNGERS
...
removed del() calls for objects, now it sets loc to null and removes it from master_controller processing
Much quicker :)
2014-03-30 03:15:20 -05:00
Ccomp5950
9915d28fb1
Removal of last debug message and making players be able to use languages over general comms
...
;:k = skrell speak over general comms for example.
2014-03-30 01:10:02 -05:00
Graham Lloyd
f176b2dea9
I can feel the hugs already.
2014-03-30 00:49:23 -04:00
Ccomp5950
e23530e31c
Say code rewrite, Silicon jerks now using new saycode.
...
Tracking added for AI's and Observers
Instead of calling GetVoice() over and over for everyone that can hear you we're checking a variable that is updated with Life()
removed a bunch of my debug verbs.
2014-03-29 23:28:47 -05:00
Ccomp5950
12b5db483e
Oversight, miners can now bump mine boulders just like the rock around them.
...
Screw you xenoarch code, screw you.
2014-03-29 16:07:47 -05:00
Ccomp5950
2027892395
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-03-28 18:48:05 -05:00
Ccomp5950
56ef5c165c
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/reagents/reagent_containers/food/cans.dm
2014-03-28 18:46:04 -05:00
Chinsky
60b6daadee
Merge pull request #4641 from Ccomp5950/log_fix
...
*NIX Log files part 2.
2014-03-27 15:12:19 +03:00
